Merge pull request #4590 from codesnake/amlogic_kernel_update

WeTek kernel and Mali GPU driver updates

packages/graphics/opengl-meson6/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="opengl-meson6"
-PKG_VERSION="r4p1-armhf"
+PKG_VERSION="r5p1-01rel0-armhf"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/linux/package.mk

@@ -31,7 +31,7 @@ PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and
 PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
 case "$LINUX" in
   amlogic)
-    PKG_VERSION="amlogic-3.10-0b9823d"
+    PKG_VERSION="amlogic-3.10-716f179"
     PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
   imx6)

projects/WeTek_Play/linux/linux.arm.conf

@@ -564,6 +564,7 @@ CONFIG_EARLYSUSPEND=y
 CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL=y
 # CONFIG_CONSOLE_EARLYSUSPEND is not set
 # CONFIG_FB_EARLYSUSPEND is not set
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_AUTOSLEEP is not set
@@ -577,6 +578,7 @@ CONFIG_CPU_PM=y
 # CONFIG_SUSPEND_TIME is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_NET=y
 
 #
@@ -1309,11 +1311,12 @@ CONFIG_MALI400=m
 # CONFIG_MALI400_DEBUG is not set
 # CONFIG_MALI400_PROFILING is not set
 CONFIG_MALI400_UMP=y
-# CONFIG_MALI400_POWER_PERFORMANCE_POLICY is not set
+# CONFIG_MALI_DVFS is not set
 CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH=y
 CONFIG_MALI_SHARED_INTERRUPTS=y
 CONFIG_MESON6_GPU_EXTRA=y
 # CONFIG_MALI_PMU_PARALLEL_POWER_UP is not set
+# CONFIG_MALI_DT is not set
 # CONFIG_MALI_QUIET is not set
 
 #

projects/WeTek_Play/patches/linux/004-fix-build-with-gcc-5.patch

@@ -1,16 +0,0 @@
-# see https://github.com/wongsyrone/openwrt-1/commit/93c0a5173414cfa7684547de3c3a1f3dc4240383
-# and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65932
-
-diff -Naur linux-amlogic-3.10-753dc30.orig/arch/arm/Makefile linux-amlogic-3.10-753dc30/arch/arm/Makefile
---- linux-amlogic-3.10-753dc30.orig/arch/arm/Makefile	2015-09-30 12:37:18.000000000 -0700
-+++ linux-amlogic-3.10-753dc30/arch/arm/Makefile	2015-10-05 13:39:01.341686718 -0700
-@@ -116,7 +116,8 @@
- endif
- 
- # Need -Uarm for gcc < 3.x
--KBUILD_CFLAGS	+=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
-+# Maybe we need -fno-ipa-sra for gcc > 4.9.x
-+KBUILD_CFLAGS	+=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm -fno-ipa-sra
- KBUILD_AFLAGS	+=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float
- 
- CHECKFLAGS	+= -D__arm__

projects/WeTek_Play/patches/linux/999.01-LLVMLinux_use_static_inline_in_ARM_ftrace.h.patch

@@ -1,52 +0,0 @@
-From aeea3592a13bf12861943e44fc48f1f270941f8d Mon Sep 17 00:00:00 2001
-From: Behan Webster <behanw@converseincode.com>
-Date: Wed, 24 Sep 2014 01:06:46 +0100
-Subject: ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
-
-With compilers which follow the C99 standard (like modern versions of gcc and
-clang), "extern inline" does the wrong thing (emits code for an externally
-linkable version of the inline function). In this case using static inline
-and removing the NULL version of return_address in return_address.c does
-the right thing.
-
-Signed-off-by: Behan Webster <behanw@converseincode.com>
-Reviewed-by: Mark Charlebois <charlebm@gmail.com>
-Acked-by: Steven Rostedt <rostedt@goodmis.org>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
----
- arch/arm/include/asm/ftrace.h    | 2 +-
- arch/arm/kernel/return_address.c | 5 -----
- 2 files changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
-index 39eb16b..bfe2a2f 100644
---- a/arch/arm/include/asm/ftrace.h
-+++ b/arch/arm/include/asm/ftrace.h
-@@ -45,7 +45,7 @@ void *return_address(unsigned int);
- 
- #else
- 
--extern inline void *return_address(unsigned int level)
-+static inline void *return_address(unsigned int level)
- {
- 	return NULL;
- }
-diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
-index fafedd8..f6aa84d 100644
---- a/arch/arm/kernel/return_address.c
-+++ b/arch/arm/kernel/return_address.c
-@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
- #warning "TODO: return_address should use unwind tables"
- #endif
- 
--void *return_address(unsigned int level)
--{
--	return NULL;
--}
--
- #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
- 
- EXPORT_SYMBOL_GPL(return_address);
--- 
-cgit v0.11.2
-