update kinetis k70 sample, remove gcc 4.x

6 files changed, 224 insertions, 31 deletions

diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70
index b9373dc1f..e5ffb6caf 100644
--- a/target/arm/systems/kinetis-k70
+++ b/target/arm/systems/kinetis-k70
@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_KINETIS_K70
 	bool "Kinetis K70"
 	depends on ADK_TARGET_OS_LINUX
-	depends on ADK_EXPERIMENTAL
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_CORTEX_M3
 	select ADK_TARGET_ARCH_ARM_WITH_THUMB
@@ -12,7 +11,7 @@ config ADK_TARGET_SYSTEM_KINETIS_K70
 	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_UCLINUX
-	select ADK_TARGET_KERNEL_UIMAGE
+	select ADK_TARGET_KERNEL_IMAGE
 	help
 	  Kinetis K70
 
diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler
index e44f0fbd6..6d37de7a0 100644
--- a/target/config/Config.in.compiler
+++ b/target/config/Config.in.compiler
@@ -22,8 +22,6 @@ default ADK_TOOLCHAIN_GCC_OR1K if ADK_TARGET_ARCH_OR1K
 default ADK_TOOLCHAIN_GCC_NDS32 if ADK_TARGET_ARCH_NDS32
 default ADK_TOOLCHAIN_GCC_4_2 if ADK_TARGET_ARCH_METAG
 default ADK_TOOLCHAIN_GCC_4_4 if ADK_TARGET_ARCH_AVR32
-default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_ARCH_LM32 && !ADK_TARGET_LIB_NEWLIB
-default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_SYSTEM_KINETIS_K70
 default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_CPU_SH_J2
 default ADK_TOOLCHAIN_GCC_7
 
@@ -49,11 +47,6 @@ config ADK_TOOLCHAIN_GCC_6
         bool "6.3.0"
 	depends on ADK_TARGET_CPU_SH_J2
 
-config ADK_TOOLCHAIN_GCC_4_9
-	bool "4.9.4"
-	depends on ADK_TARGET_ARCH_LM32 \
-		|| ADK_TARGET_ARCH_SPARC
-
 config ADK_TOOLCHAIN_GCC_CSKY
 	bool "csky"
 	depends on ADK_TARGET_ARCH_CSKY
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index a4f90b241..7d6c0dc36 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -228,26 +228,26 @@ config ADK_TARGET_KERNEL_GIT_REPO
 config ADK_TARGET_KERNEL_GIT_REPO_NAME
 	string
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
+	default "csky" if ADK_TARGET_ARCH_CSKY
+	default "lm32" if ADK_TARGET_ARCH_LM32
+	default "riscv" if ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64
 	default "rpi" if ADK_TARGET_BOARD_BCM28XX
 	default "ad" if ADK_TARGET_SYSTEM_ADSP_BF537
+	default "bb" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default "emcraft" if ADK_TARGET_SYSTEM_KINETIS_K70
-	default "fslc" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "clearfog" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
-	default "bb" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-	default "lm32" if ADK_TARGET_ARCH_LM32
-	default "csky" if ADK_TARGET_ARCH_CSKY
-	default "riscv" if ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64
+	default "fslc" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "linus"
 
 config ADK_TARGET_KERNEL_GIT
 	string "git version"
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
-	default "cfa29b46af94d83e31aa000dbaee553f9c4d670c" if ADK_TARGET_BOARD_BCM28XX
-	default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537
-	default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32
 	default "314c498ddc8c43a66ca96ff3af7da98e10fa1cc6" if ADK_TARGET_ARCH_CSKY
+	default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32
 	default "1cd2e072bbd1a518e11b551435be0ad84a2c52af" if ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64
-	default "1d008423ab5fd12459f53342e4d17585ec63cfe4" if ADK_TARGET_SYSTEM_KINETIS_K70
+	default "cfa29b46af94d83e31aa000dbaee553f9c4d670c" if ADK_TARGET_BOARD_BCM28XX
+	default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537
+	default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
 	default "c85fbc86c61a8c8fd45ab1fe3d1bdd2df12f7962" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "8624998967676862843aed1f8ee2141e98987f81" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
@@ -257,9 +257,9 @@ config ADK_TARGET_KERNEL_GIT_VER
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
 	default "4.9.13" if ADK_TARGET_ARCH_CSKY
 	default "4.9.37" if ADK_TARGET_BOARD_BCM28XX
-	default "3.14.79" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70
+	default "3.14.79" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 
 config ADK_TARGET_KERNEL_GIT_TYPE
 	string
diff --git a/target/linux/patches/1d008423ab5fd12459f53342e4d17585ec63cfe4/perl-fix.patch b/target/linux/patches/1d008423ab5fd12459f53342e4d17585ec63cfe4/perl-fix.patch
deleted file mode 100644
index 2de40e0e3..000000000
--- a/target/linux/patches/1d008423ab5fd12459f53342e4d17585ec63cfe4/perl-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-1d008423ab5fd12459f53342e4d17585ec63cfe4.orig/kernel/timeconst.pl linux-1d008423ab5fd12459f53342e4d17585ec63cfe4/kernel/timeconst.pl
---- linux-1d008423ab5fd12459f53342e4d17585ec63cfe4.orig/kernel/timeconst.pl	2016-12-22 18:05:10.000000000 +0100
-+++ linux-1d008423ab5fd12459f53342e4d17585ec63cfe4/kernel/timeconst.pl	2016-12-22 18:42:55.573173008 +0100
-@@ -370,7 +370,7 @@
- 	}
- 
- 	@val = @{$canned_values{$hz}};
--	if (!defined(@val)) {
-+	if (!@val) {
- 		@val = compute_values($hz);
- 	}
- 	output($hz, @val);
diff --git a/target/linux/patches/e7c8afc1dda7b7c18596d90ad6a17ae886650b72/new-gcc.patch b/target/linux/patches/e7c8afc1dda7b7c18596d90ad6a17ae886650b72/new-gcc.patch
new file mode 100644
index 000000000..fbee590f5
--- /dev/null
+++ b/target/linux/patches/e7c8afc1dda7b7c18596d90ad6a17ae886650b72/new-gcc.patch
@@ -0,0 +1,183 @@
+diff -Nur linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72.orig/include/linux/compiler-gcc.h linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72/include/linux/compiler-gcc.h
+--- linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72.orig/include/linux/compiler-gcc.h	2017-09-27 03:56:44.000000000 +0200
++++ linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72/include/linux/compiler-gcc.h	2017-09-27 04:18:30.590990967 +0200
+@@ -6,6 +6,10 @@
+  * Common definitions for all gcc versions go here.
+  */
+ 
++#define GCC_VERSION (__GNUC__ * 10000		\
++		     + __GNUC_MINOR__ * 100	\
++		     + __GNUC_PATCHLEVEL__)
++
+ 
+ /* Optimization barrier */
+ /* The "volatile" is due to gcc bugs */
+@@ -81,7 +85,164 @@
+ #define __maybe_unused			__attribute__((unused))
+ #define __always_unused			__attribute__((unused))
+ 
+-#define __gcc_header(x) #x
+-#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
+-#define gcc_header(x) _gcc_header(x)
+-#include gcc_header(__GNUC__)
++/* gcc version specific checks */
++
++#if GCC_VERSION < 30200
++# error Sorry, your compiler is too old - please upgrade it.
++#endif
++
++#if GCC_VERSION < 30300
++# define __used			__attribute__((__unused__))
++#else
++# define __used			__attribute__((__used__))
++#endif
++
++#ifdef CONFIG_GCOV_KERNEL
++# if GCC_VERSION < 30400
++#   error "GCOV profiling support for gcc versions below 3.4 not included"
++# endif /* __GNUC_MINOR__ */
++#endif /* CONFIG_GCOV_KERNEL */
++
++#if GCC_VERSION >= 30400
++#define __must_check		__attribute__((warn_unused_result))
++#endif
++
++#if GCC_VERSION >= 40000
++
++/* GCC 4.1.[01] miscompiles __weak */
++#ifdef __KERNEL__
++# if GCC_VERSION >= 40100 &&  GCC_VERSION <= 40101
++#  error Your version of gcc miscompiles the __weak directive
++# endif
++#endif
++
++#define __used			__attribute__((__used__))
++#define __compiler_offsetof(a, b)					\
++	__builtin_offsetof(a, b)
++
++#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
++# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
++#endif
++
++#if GCC_VERSION >= 40300
++/* Mark functions as cold. gcc will assume any path leading to a call
++ * to them will be unlikely.  This means a lot of manual unlikely()s
++ * are unnecessary now for any paths leading to the usual suspects
++ * like BUG(), printk(), panic() etc. [but let's keep them for now for
++ * older compilers]
++ *
++ * Early snapshots of gcc 4.3 don't support this and we can't detect this
++ * in the preprocessor, but we can live with this because they're unreleased.
++ * Maketime probing would be overkill here.
++ *
++ * gcc also has a __attribute__((__hot__)) to move hot functions into
++ * a special section, but I don't see any sense in this right now in
++ * the kernel context
++ */
++#define __cold			__attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++#endif /* GCC_VERSION >= 40300 */
++
++#if GCC_VERSION >= 40500
++/*
++ * Mark a position in code as unreachable.  This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased.  Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone	__attribute__((__noclone__, __optimize__("no-tracer")))
++
++#endif /* GCC_VERSION >= 40500 */
++
++#if GCC_VERSION >= 40600
++/*
++ * When used with Link Time Optimization, gcc can optimize away C functions or
++ * variables which are referenced only from assembly code.  __visible tells the
++ * optimizer that something else uses this function or variable, thus preventing
++ * this.
++ */
++#define __visible	__attribute__((externally_visible))
++#endif
++
++
++#if GCC_VERSION >= 40900 && !defined(__CHECKER__)
++/*
++ * __assume_aligned(n, k): Tell the optimizer that the returned
++ * pointer can be assumed to be k modulo n. The second argument is
++ * optional (default 0), so we use a variadic macro to make the
++ * shorthand.
++ *
++ * Beware: Do not apply this to functions which may return
++ * ERR_PTRs. Also, it is probably unwise to apply it to functions
++ * returning extra information in the low bits (but in that case the
++ * compiler should see some alignment anyway, when the return value is
++ * massaged by 'flags = ptr & 3; ptr &= ~3;').
++ */
++#define __assume_aligned(a, ...) __attribute__((__assume_aligned__(a, ## __VA_ARGS__)))
++#endif
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#if GCC_VERSION >= 40400
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#endif
++#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
++#define __HAVE_BUILTIN_BSWAP16__
++#endif
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
++
++#if GCC_VERSION >= 70000
++#define KASAN_ABI_VERSION 5
++#elif GCC_VERSION >= 50000
++#define KASAN_ABI_VERSION 4
++#elif GCC_VERSION >= 40902
++#define KASAN_ABI_VERSION 3
++#endif
++
++#if GCC_VERSION >= 40902
++/*
++ * Tell the compiler that address safety instrumentation (KASAN)
++ * should not be applied to that function.
++ * Conflicts with inlining: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368
++ */
++#define __no_sanitize_address __attribute__((no_sanitize_address))
++#endif
++
++#endif	/* gcc version >= 40000 specific checks */
++
++#if !defined(__noclone)
++#define __noclone	/* not needed */
++#endif
++
++#if !defined(__no_sanitize_address)
++#define __no_sanitize_address
++#endif
++
++/*
++ * A trick to suppress uninitialized variable warning without generating any
++ * code
++ */
++#define uninitialized_var(x) x = x
diff --git a/target/linux/patches/e7c8afc1dda7b7c18596d90ad6a17ae886650b72/no-extern-inline.patch b/target/linux/patches/e7c8afc1dda7b7c18596d90ad6a17ae886650b72/no-extern-inline.patch
new file mode 100644
index 000000000..36ef62928
--- /dev/null
+++ b/target/linux/patches/e7c8afc1dda7b7c18596d90ad6a17ae886650b72/no-extern-inline.patch
@@ -0,0 +1,30 @@
+diff -Nur linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72.orig/arch/arm/include/asm/ftrace.h linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72/arch/arm/include/asm/ftrace.h
+--- linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72.orig/arch/arm/include/asm/ftrace.h	2017-09-27 03:56:40.000000000 +0200
++++ linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72/arch/arm/include/asm/ftrace.h	2017-09-27 04:31:03.708572870 +0200
+@@ -27,7 +27,7 @@
+ 
+ #else
+ 
+-extern inline void *return_address(unsigned int level)
++static inline void *return_address(unsigned int level)
+ {
+ 	return NULL;
+ }
+diff -Nur linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72.orig/include/linux/inotify.h linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72/include/linux/inotify.h
+--- linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72.orig/include/linux/inotify.h	2017-09-27 03:56:44.000000000 +0200
++++ linux-e7c8afc1dda7b7c18596d90ad6a17ae886650b72/include/linux/inotify.h	2017-09-27 04:47:37.707436849 +0200
+@@ -230,12 +230,12 @@
+ {
+ }
+ 
+-extern inline int pin_inotify_watch(struct inotify_watch *watch)
++static inline int pin_inotify_watch(struct inotify_watch *watch)
+ {
+ 	return 0;
+ }
+ 
+-extern inline void unpin_inotify_watch(struct inotify_watch *watch)
++static inline void unpin_inotify_watch(struct inotify_watch *watch)
+ {
+ }
+