Browse Source

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

Waldemar Brodkorb 7 years ago
parent
commit
d9db1a94a5
31 changed files with 17 additions and 21 deletions
  1. 4 10
      mk/kernel-ver.mk
  2. 0 0
      target/avr32/atmel-ngw100/patches/4.1.30/0001-net-macb-improve-big-endian-CPU-support.patch
  3. 2 2
      target/config/Config.in.binfmt
  4. 11 9
      target/config/Config.in.kernelversion
  5. 0 0
      target/cris/qemu-cris/patches/4.1.30/crisv32_ethernet_driver.patch
  6. 0 0
      target/cris/qemu-cris/patches/4.4.17/crisv32_ethernet_driver.patch
  7. 0 0
      target/linux/patches/4.1.30/aufs.patch
  8. 0 0
      target/linux/patches/4.1.30/cleankernel.patch
  9. 0 0
      target/linux/patches/4.1.30/cris-header.patch
  10. 0 0
      target/linux/patches/4.1.30/initramfs-nosizelimit.patch
  11. 0 0
      target/linux/patches/4.1.30/j2-core.patch
  12. 0 0
      target/linux/patches/4.1.30/mtd-rootfs.patch
  13. 0 0
      target/linux/patches/4.1.30/patch-realtime
  14. 0 0
      target/linux/patches/4.1.30/regmap-default-on.patch
  15. 0 0
      target/linux/patches/4.1.30/remove-warn.patch
  16. 0 0
      target/linux/patches/4.1.30/startup.patch
  17. 0 0
      target/linux/patches/4.1.30/use-gawk.patch
  18. 0 0
      target/linux/patches/4.1.30/use-libgcc-for-sh.patch
  19. 0 0
      target/linux/patches/4.4.17/coldfire-sighandler.patch
  20. 0 0
      target/linux/patches/4.4.17/crisv32.patch
  21. 0 0
      target/linux/patches/4.4.17/initramfs-nosizelimit.patch
  22. 0 0
      target/linux/patches/4.4.17/ld-or1k.patch
  23. 0 0
      target/linux/patches/4.4.17/macsonic.patch
  24. 0 0
      target/linux/patches/4.4.17/mips-xz.patch
  25. 0 0
      target/linux/patches/4.4.17/patch-realtime
  26. 0 0
      target/linux/patches/4.4.17/revert-sparc.patch
  27. 0 0
      target/linux/patches/4.4.17/startup.patch
  28. 0 0
      target/linux/patches/4.4.17/use-libgcc-for-sh.patch
  29. 0 0
      target/m68k/qemu-m68k-mcf5208/patches/4.1.30/m68k-coldfire-fec.patch
  30. 0 0
      target/mips/ath79/patches/4.1.30/0001-openwrt-ath79.patch
  31. 0 0
      target/or1k/patches/4.1.30/ld-or1k.patch

+ 4 - 10
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

+ 0 - 0
target/avr32/atmel-ngw100/patches/4.1.26/0001-net-macb-improve-big-endian-CPU-support.patch → target/avr32/atmel-ngw100/patches/4.1.30/0001-net-macb-improve-big-endian-CPU-support.patch


+ 2 - 2
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.

+ 11 - 9
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
 

+ 0 - 0
target/cris/qemu-cris/patches/4.1.26/crisv32_ethernet_driver.patch → target/cris/qemu-cris/patches/4.1.30/crisv32_ethernet_driver.patch


+ 0 - 0
target/cris/qemu-cris/patches/4.4.14/crisv32_ethernet_driver.patch → target/cris/qemu-cris/patches/4.4.17/crisv32_ethernet_driver.patch


+ 0 - 0
target/linux/patches/4.1.26/aufs.patch → target/linux/patches/4.1.30/aufs.patch


+ 0 - 0
target/linux/patches/4.1.26/cleankernel.patch → target/linux/patches/4.1.30/cleankernel.patch


+ 0 - 0
target/linux/patches/4.1.26/cris-header.patch → target/linux/patches/4.1.30/cris-header.patch


+ 0 - 0
target/linux/patches/4.1.26/initramfs-nosizelimit.patch → target/linux/patches/4.1.30/initramfs-nosizelimit.patch


+ 0 - 0
target/linux/patches/4.1.26/j2-core.patch → target/linux/patches/4.1.30/j2-core.patch


+ 0 - 0
target/linux/patches/4.1.26/mtd-rootfs.patch → target/linux/patches/4.1.30/mtd-rootfs.patch


+ 0 - 0
target/linux/patches/4.1.26/patch-realtime → target/linux/patches/4.1.30/patch-realtime


+ 0 - 0
target/linux/patches/4.1.26/regmap-default-on.patch → target/linux/patches/4.1.30/regmap-default-on.patch


+ 0 - 0
target/linux/patches/4.1.26/remove-warn.patch → target/linux/patches/4.1.30/remove-warn.patch


+ 0 - 0
target/linux/patches/4.1.26/startup.patch → target/linux/patches/4.1.30/startup.patch


+ 0 - 0
target/linux/patches/4.1.26/use-gawk.patch → target/linux/patches/4.1.30/use-gawk.patch


+ 0 - 0
target/linux/patches/4.1.26/use-libgcc-for-sh.patch → target/linux/patches/4.1.30/use-libgcc-for-sh.patch


+ 0 - 0
target/linux/patches/4.4.14/coldfire-sighandler.patch → target/linux/patches/4.4.17/coldfire-sighandler.patch


+ 0 - 0
target/linux/patches/4.4.14/crisv32.patch → target/linux/patches/4.4.17/crisv32.patch


+ 0 - 0
target/linux/patches/4.4.14/initramfs-nosizelimit.patch → target/linux/patches/4.4.17/initramfs-nosizelimit.patch


+ 0 - 0
target/linux/patches/4.4.14/ld-or1k.patch → target/linux/patches/4.4.17/ld-or1k.patch


+ 0 - 0
target/linux/patches/4.4.14/macsonic.patch → target/linux/patches/4.4.17/macsonic.patch


+ 0 - 0
target/linux/patches/4.4.14/mips-xz.patch → target/linux/patches/4.4.17/mips-xz.patch


+ 0 - 0
target/linux/patches/4.4.14/patch-realtime → target/linux/patches/4.4.17/patch-realtime


+ 0 - 0
target/linux/patches/4.4.14/revert-sparc.patch → target/linux/patches/4.4.17/revert-sparc.patch


+ 0 - 0
target/linux/patches/4.4.14/startup.patch → target/linux/patches/4.4.17/startup.patch


+ 0 - 0
target/linux/patches/4.4.14/use-libgcc-for-sh.patch → target/linux/patches/4.4.17/use-libgcc-for-sh.patch


+ 0 - 0
target/m68k/qemu-m68k-mcf5208/patches/4.1.26/m68k-coldfire-fec.patch → target/m68k/qemu-m68k-mcf5208/patches/4.1.30/m68k-coldfire-fec.patch


+ 0 - 0
target/mips/ath79/patches/4.1.26/0001-openwrt-ath79.patch → target/mips/ath79/patches/4.1.30/0001-openwrt-ath79.patch


+ 0 - 0
target/or1k/patches/4.1.26/ld-or1k.patch → target/or1k/patches/4.1.30/ld-or1k.patch