From 7b759f846cdda1800e638210ef5a63b61b5dc4c5 Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Thu, 29 Jan 2015 23:53:39 +0100 Subject: [PATCH 1/2] WeTek_Play: Update Linux kernel to 3.10-84deff2 --- packages/linux/package.mk | 2 +- projects/WeTek_Play/linux/linux.arm.conf | 5 +++-- .../patches/linux/120-enable_cputemp.patch | 17 ----------------- .../linux/140-fix_amvidocap_src_rect_typo.patch | 14 -------------- 4 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 projects/WeTek_Play/patches/linux/120-enable_cputemp.patch delete mode 100644 projects/WeTek_Play/patches/linux/140-fix_amvidocap_src_rect_typo.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 78332f6286..16889bea2c 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -19,7 +19,7 @@ PKG_NAME="linux" case "$LINUX" in amlogic) - PKG_VERSION="amlogic-3.10-fa4c242" + PKG_VERSION="amlogic-3.10-84deff2" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" ;; imx6) diff --git a/projects/WeTek_Play/linux/linux.arm.conf b/projects/WeTek_Play/linux/linux.arm.conf index 2de5dfe958..c3107f45de 100644 --- a/projects/WeTek_Play/linux/linux.arm.conf +++ b/projects/WeTek_Play/linux/linux.arm.conf @@ -1167,6 +1167,7 @@ CONFIG_AML_VOUT_FRAMERATE_AUTOMATION=y # Amlogic osd module # CONFIG_FB_AM=y +# CONFIG_FB_OSD_SUPPORT_SYNC_FENCE is not set CONFIG_FB_OSD2_ENABLE=y # CONFIG_FB_OSD2_CURSOR is not set CONFIG_FB_OSD2_DEFAULT_BITS_PER_PIXEL=32 @@ -3032,6 +3033,7 @@ CONFIG_LEDS_CLASS=y # # CONFIG_LEDS_LM3530 is not set # CONFIG_LEDS_LM3642 is not set +CONFIG_LEDS_WETEKPLAY=y # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_GPIO is not set # CONFIG_LEDS_LP3944 is not set @@ -3049,7 +3051,6 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM355x is not set # CONFIG_LEDS_OT200 is not set # CONFIG_LEDS_BLINKM is not set -CONFIG_LEDS_WETEKPLAY=y # # LED Triggers @@ -3057,12 +3058,12 @@ CONFIG_LEDS_WETEKPLAY=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_REMOTE_CONTROL=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_LEDS_TRIGGER_REMOTE_CONTROL=y # # iptables trigger is under Netfilter config (LED target) diff --git a/projects/WeTek_Play/patches/linux/120-enable_cputemp.patch b/projects/WeTek_Play/patches/linux/120-enable_cputemp.patch deleted file mode 100644 index 8fb9019894..0000000000 --- a/projects/WeTek_Play/patches/linux/120-enable_cputemp.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/arch/arm/mach-meson6/cpu.c.orig 2015-01-18 19:50:04.897840428 +0100 -+++ b/arch/arm/mach-meson6/cpu.c 2015-01-18 19:50:30.241839679 +0100 -@@ -59,6 +59,14 @@ - int mali_revb_flag = -1; - //int mali_version(void) - -+int (*get_cpu_temperature_celius)(void) = NULL; -+EXPORT_SYMBOL_GPL(get_cpu_temperature_celius); -+ -+int get_cpu_temperature(void) -+{ -+ return get_cpu_temperature_celius ? get_cpu_temperature_celius() : -1; -+} -+ - EXPORT_SYMBOL_GPL(mali_revb_flag); - static int __init maliversion(char *str) - { diff --git a/projects/WeTek_Play/patches/linux/140-fix_amvidocap_src_rect_typo.patch b/projects/WeTek_Play/patches/linux/140-fix_amvidocap_src_rect_typo.patch deleted file mode 100644 index d4be79a491..0000000000 --- a/projects/WeTek_Play/patches/linux/140-fix_amvidocap_src_rect_typo.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/drivers/amlogic/amports/amvideocap.c b/drivers/amlogic/amports/amvideocap.c -index 8d43335..d4b2ccb 100755 ---- a/drivers/amlogic/amports/amvideocap.c -+++ b/drivers/amlogic/amports/amvideocap.c -@@ -275,8 +275,8 @@ static ssize_t amvideocap_YUV_to_RGB(struct amvideocap_private *priv, u32 cur_i - ge2d_config.src_para.x_rev = 0; - ge2d_config.src_para.y_rev = 0; - ge2d_config.src_para.color = 0; -- ge2d_config.src_para.top = input_x; -- ge2d_config.src_para.left = input_y; -+ ge2d_config.src_para.left = input_x; -+ ge2d_config.src_para.top = input_y; - ge2d_config.src_para.width = input_width; - ge2d_config.src_para.height = input_height; From 95e3d9515585962db2d9a286d66d59af8ba64467 Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Fri, 30 Jan 2015 00:42:49 +0100 Subject: [PATCH 2/2] projects/WeTek_Play/linux: Enable CONFIG_VSYNC_RDMA to prevent blinking of a fullscreen video --- projects/WeTek_Play/linux/linux.arm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/WeTek_Play/linux/linux.arm.conf b/projects/WeTek_Play/linux/linux.arm.conf index c3107f45de..b4ee4681d8 100644 --- a/projects/WeTek_Play/linux/linux.arm.conf +++ b/projects/WeTek_Play/linux/linux.arm.conf @@ -1113,7 +1113,7 @@ CONFIG_AML_AUDIO_DSP=y CONFIG_AML_VFM=y CONFIG_AM_PTSSERVER=y # CONFIG_H264_4K2K_SINGLE_CORE is not set -# CONFIG_VSYNC_RDMA is not set +CONFIG_VSYNC_RDMA=y CONFIG_AM_VIDEO=y # CONFIG_AM_VIDEO2 is not set # CONFIG_KEEP_FRAME_RESERVED is not set