linux: update 4.x kernel, add m68k patch and allow one memory flat

31 files changed, 17 insertions, 21 deletions

diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 7b345505e..74c57352c 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -25,23 +25,17 @@ KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		7e2d53c8a36a159c444be8f452eae898fadc1f1862fe470a36c836c3d1d613c5
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_5),y)
-KERNEL_FILE_VER:=	4.5.7
-KERNEL_RELEASE:=	1
-KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		c070a62095fe830e7bfdb159e577216e3ed237ad3ab9a2590f53cde4e881fb2b
-endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_4),y)
-KERNEL_FILE_VER:=	4.4.14
+KERNEL_FILE_VER:=	4.4.17
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		5953ba12797160a68b1068378f826ddac8a298f8f3273876d3bd18222b0555f9
+KERNEL_HASH:=		159451471c0df6bde8043b85dfacafa58e65c4a0cabb1157e83916326cd04f81
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_1),y)
-KERNEL_FILE_VER:=	4.1.26
+KERNEL_FILE_VER:=	4.1.30
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		babcfca252a1427278b7bc4372fdad40fa1388d8fad2d85ca74cf72222e7f071
+KERNEL_HASH:=		9d22eaaecce666c9e813653bd2a7654849f3f105bdcefe3fe4ee8035f2ad92c6
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_3_18),y)
 KERNEL_FILE_VER:=	3.18.33
diff --git a/target/avr32/atmel-ngw100/patches/4.1.26/0001-net-macb-improve-big-endian-CPU-support.patch b/target/avr32/atmel-ngw100/patches/4.1.30/0001-net-macb-improve-big-endian-CPU-support.patch
index 96a0a96b6..96a0a96b6 100644
--- a/target/avr32/atmel-ngw100/patches/4.1.26/0001-net-macb-improve-big-endian-CPU-support.patch
+++ b/target/avr32/atmel-ngw100/patches/4.1.30/0001-net-macb-improve-big-endian-CPU-support.patch
diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt
index 3b88791d6..69da78a44 100644
--- a/target/config/Config.in.binfmt
+++ b/target/config/Config.in.binfmt
@@ -33,13 +33,13 @@ default ADK_TARGET_BINFMT_FLAT_ONE
 
 config ADK_TARGET_BINFMT_FLAT_ONE
 	bool "One memory region"
-	depends on ADK_TARGET_ARCH_BFIN
+	depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_M68K
 	help
 	  All segments are linked into one memory region.
 
 config ADK_TARGET_BINFMT_FLAT_SEP_DATA
 	bool "Separate data and code region"
-	depends on ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_BFIN
+	depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_M68K
 	help
 	  Allow for the data and text segments to be separated and placed in
 	  different regions of memory.
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index 653a332d2..ab2041114 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -24,22 +24,16 @@ config ADK_TARGET_KERNEL_VERSION_4_6
 	bool "4.6.5"
 	depends on !ADK_TARGET_ARCH_NDS32
 
-config ADK_TARGET_KERNEL_VERSION_4_5
-	bool "4.5.7"
-	depends on !ADK_TARGET_ARCH_NDS32
-	depends on !ADK_TARGET_ARCH_NIOS2
-	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
-	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-
 config ADK_TARGET_KERNEL_VERSION_4_4
-	bool "4.4.14"
+	bool "4.4.17"
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
+	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 
 config ADK_TARGET_KERNEL_VERSION_4_1
-	bool "4.1.26"
+	bool "4.1.30"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_H8300
@@ -47,6 +41,7 @@ config ADK_TARGET_KERNEL_VERSION_4_1
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_SPARC
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 
@@ -63,6 +58,7 @@ config ADK_TARGET_KERNEL_VERSION_3_18
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
 	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 
@@ -77,6 +73,7 @@ config ADK_TARGET_KERNEL_VERSION_3_14
 	depends on !ADK_TARGET_BOARD_ATH79
 	depends on !ADK_TARGET_BOARD_BCM28XX
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 
@@ -93,6 +90,7 @@ config ADK_TARGET_KERNEL_VERSION_3_12
 	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 
@@ -110,6 +108,7 @@ config ADK_TARGET_KERNEL_VERSION_3_10
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 
@@ -125,6 +124,7 @@ config ADK_TARGET_KERNEL_VERSION_3_4
 	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 
@@ -141,6 +141,7 @@ config ADK_TARGET_KERNEL_VERSION_3_2
 	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 
@@ -157,6 +158,7 @@ config ADK_TARGET_KERNEL_VERSION_2_6_32
 	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 
diff --git a/target/cris/qemu-cris/patches/4.1.26/crisv32_ethernet_driver.patch b/target/cris/qemu-cris/patches/4.1.30/crisv32_ethernet_driver.patch
index cd098665e..cd098665e 100644
--- a/target/cris/qemu-cris/patches/4.1.26/crisv32_ethernet_driver.patch
+++ b/target/cris/qemu-cris/patches/4.1.30/crisv32_ethernet_driver.patch
diff --git a/target/cris/qemu-cris/patches/4.4.14/crisv32_ethernet_driver.patch b/target/cris/qemu-cris/patches/4.4.17/crisv32_ethernet_driver.patch
index 80f03383c..80f03383c 100644
--- a/target/cris/qemu-cris/patches/4.4.14/crisv32_ethernet_driver.patch
+++ b/target/cris/qemu-cris/patches/4.4.17/crisv32_ethernet_driver.patch
diff --git a/target/linux/patches/4.1.26/aufs.patch b/target/linux/patches/4.1.30/aufs.patch
index 749c90989..749c90989 100644
--- a/target/linux/patches/4.1.26/aufs.patch
+++ b/target/linux/patches/4.1.30/aufs.patch
diff --git a/target/linux/patches/4.1.26/cleankernel.patch b/target/linux/patches/4.1.30/cleankernel.patch
index 59693f426..59693f426 100644
--- a/target/linux/patches/4.1.26/cleankernel.patch
+++ b/target/linux/patches/4.1.30/cleankernel.patch
diff --git a/target/linux/patches/4.1.26/cris-header.patch b/target/linux/patches/4.1.30/cris-header.patch
index 2b5a88461..2b5a88461 100644
--- a/target/linux/patches/4.1.26/cris-header.patch
+++ b/target/linux/patches/4.1.30/cris-header.patch
diff --git a/target/linux/patches/4.1.26/initramfs-nosizelimit.patch b/target/linux/patches/4.1.30/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/4.1.26/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.1.30/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.1.26/j2-core.patch b/target/linux/patches/4.1.30/j2-core.patch
index 38136df2c..38136df2c 100644
--- a/target/linux/patches/4.1.26/j2-core.patch
+++ b/target/linux/patches/4.1.30/j2-core.patch
diff --git a/target/linux/patches/4.1.26/mtd-rootfs.patch b/target/linux/patches/4.1.30/mtd-rootfs.patch
index 5f6d82b5c..5f6d82b5c 100644
--- a/target/linux/patches/4.1.26/mtd-rootfs.patch
+++ b/target/linux/patches/4.1.30/mtd-rootfs.patch
diff --git a/target/linux/patches/4.1.26/patch-realtime b/target/linux/patches/4.1.30/patch-realtime
index 6ecf019b9..6ecf019b9 100644
--- a/target/linux/patches/4.1.26/patch-realtime
+++ b/target/linux/patches/4.1.30/patch-realtime
diff --git a/target/linux/patches/4.1.26/regmap-default-on.patch b/target/linux/patches/4.1.30/regmap-default-on.patch
index 8d72224bf..8d72224bf 100644
--- a/target/linux/patches/4.1.26/regmap-default-on.patch
+++ b/target/linux/patches/4.1.30/regmap-default-on.patch
diff --git a/target/linux/patches/4.1.26/remove-warn.patch b/target/linux/patches/4.1.30/remove-warn.patch
index 1f89c710d..1f89c710d 100644
--- a/target/linux/patches/4.1.26/remove-warn.patch
+++ b/target/linux/patches/4.1.30/remove-warn.patch
diff --git a/target/linux/patches/4.1.26/startup.patch b/target/linux/patches/4.1.30/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/4.1.26/startup.patch
+++ b/target/linux/patches/4.1.30/startup.patch
diff --git a/target/linux/patches/4.1.26/use-gawk.patch b/target/linux/patches/4.1.30/use-gawk.patch
index 5b312589d..5b312589d 100644
--- a/target/linux/patches/4.1.26/use-gawk.patch
+++ b/target/linux/patches/4.1.30/use-gawk.patch
diff --git a/target/linux/patches/4.1.26/use-libgcc-for-sh.patch b/target/linux/patches/4.1.30/use-libgcc-for-sh.patch
index 6420219b0..6420219b0 100644
--- a/target/linux/patches/4.1.26/use-libgcc-for-sh.patch
+++ b/target/linux/patches/4.1.30/use-libgcc-for-sh.patch
diff --git a/target/linux/patches/4.4.14/coldfire-sighandler.patch b/target/linux/patches/4.4.17/coldfire-sighandler.patch
index c52a4e228..c52a4e228 100644
--- a/target/linux/patches/4.4.14/coldfire-sighandler.patch
+++ b/target/linux/patches/4.4.17/coldfire-sighandler.patch
diff --git a/target/linux/patches/4.4.14/crisv32.patch b/target/linux/patches/4.4.17/crisv32.patch
index cb9b0d028..cb9b0d028 100644
--- a/target/linux/patches/4.4.14/crisv32.patch
+++ b/target/linux/patches/4.4.17/crisv32.patch
diff --git a/target/linux/patches/4.4.14/initramfs-nosizelimit.patch b/target/linux/patches/4.4.17/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/4.4.14/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.4.17/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.4.14/ld-or1k.patch b/target/linux/patches/4.4.17/ld-or1k.patch
index 264f9166f..264f9166f 100644
--- a/target/linux/patches/4.4.14/ld-or1k.patch
+++ b/target/linux/patches/4.4.17/ld-or1k.patch
diff --git a/target/linux/patches/4.4.14/macsonic.patch b/target/linux/patches/4.4.17/macsonic.patch
index 75a6fcad2..75a6fcad2 100644
--- a/target/linux/patches/4.4.14/macsonic.patch
+++ b/target/linux/patches/4.4.17/macsonic.patch
diff --git a/target/linux/patches/4.4.14/mips-xz.patch b/target/linux/patches/4.4.17/mips-xz.patch
index 5cfac6254..5cfac6254 100644
--- a/target/linux/patches/4.4.14/mips-xz.patch
+++ b/target/linux/patches/4.4.17/mips-xz.patch
diff --git a/target/linux/patches/4.4.14/patch-realtime b/target/linux/patches/4.4.17/patch-realtime
index c677e4098..c677e4098 100644
--- a/target/linux/patches/4.4.14/patch-realtime
+++ b/target/linux/patches/4.4.17/patch-realtime
diff --git a/target/linux/patches/4.4.14/revert-sparc.patch b/target/linux/patches/4.4.17/revert-sparc.patch
index 296be0e4a..296be0e4a 100644
--- a/target/linux/patches/4.4.14/revert-sparc.patch
+++ b/target/linux/patches/4.4.17/revert-sparc.patch
diff --git a/target/linux/patches/4.4.14/startup.patch b/target/linux/patches/4.4.17/startup.patch
index e54ac19a6..e54ac19a6 100644
--- a/target/linux/patches/4.4.14/startup.patch
+++ b/target/linux/patches/4.4.17/startup.patch
diff --git a/target/linux/patches/4.4.14/use-libgcc-for-sh.patch b/target/linux/patches/4.4.17/use-libgcc-for-sh.patch
index 6420219b0..6420219b0 100644
--- a/target/linux/patches/4.4.14/use-libgcc-for-sh.patch
+++ b/target/linux/patches/4.4.17/use-libgcc-for-sh.patch
diff --git a/target/m68k/qemu-m68k-mcf5208/patches/4.1.26/m68k-coldfire-fec.patch b/target/m68k/qemu-m68k-mcf5208/patches/4.1.30/m68k-coldfire-fec.patch
index 690befe8f..690befe8f 100644
--- a/target/m68k/qemu-m68k-mcf5208/patches/4.1.26/m68k-coldfire-fec.patch
+++ b/target/m68k/qemu-m68k-mcf5208/patches/4.1.30/m68k-coldfire-fec.patch
diff --git a/target/mips/ath79/patches/4.1.26/0001-openwrt-ath79.patch b/target/mips/ath79/patches/4.1.30/0001-openwrt-ath79.patch
index 4178f20cb..4178f20cb 100644
--- a/target/mips/ath79/patches/4.1.26/0001-openwrt-ath79.patch
+++ b/target/mips/ath79/patches/4.1.30/0001-openwrt-ath79.patch
diff --git a/target/or1k/patches/4.1.26/ld-or1k.patch b/target/or1k/patches/4.1.30/ld-or1k.patch
index 81c9db6c2..81c9db6c2 100644
--- a/target/or1k/patches/4.1.26/ld-or1k.patch
+++ b/target/or1k/patches/4.1.30/ld-or1k.patch