Browse Source

linux: update 4.4.x/4.9.x/4.11.x kernel

Waldemar Brodkorb 8 years ago
parent
commit
b3c2831474
27 changed files with 91 additions and 81 deletions
  1. 6 6
      mk/kernel-ver.mk
  2. 3 5
      target/config/Config.in.kernelversion
  3. 0 70
      target/linux/patches/4.11.4/0001-sparc64.patch
  4. 41 0
      target/linux/patches/4.4.72/0001-sparc64-make-string-buffers-large-enough.patch
  5. 0 0
      target/linux/patches/4.4.72/coldfire-sighandler.patch
  6. 0 0
      target/linux/patches/4.4.72/crisv32.patch
  7. 0 0
      target/linux/patches/4.4.72/crisv32_ethernet_driver.patch
  8. 0 0
      target/linux/patches/4.4.72/initramfs-nosizelimit.patch
  9. 0 0
      target/linux/patches/4.4.72/ld-or1k.patch
  10. 0 0
      target/linux/patches/4.4.72/macsonic.patch
  11. 0 0
      target/linux/patches/4.4.72/mips-xz.patch
  12. 0 0
      target/linux/patches/4.4.72/patch-realtime
  13. 0 0
      target/linux/patches/4.4.72/startup.patch
  14. 0 0
      target/linux/patches/4.4.72/use-libgcc-for-sh.patch
  15. 0 0
      target/linux/patches/4.4.72/versatile-nommu.patch
  16. 41 0
      target/linux/patches/4.9.32/0001-sparc64-make-string-buffers-large-enough.patch
  17. 0 0
      target/linux/patches/4.9.32/crisv32_ethernet_driver.patch
  18. 0 0
      target/linux/patches/4.9.32/h8300.patch
  19. 0 0
      target/linux/patches/4.9.32/initramfs-nosizelimit.patch
  20. 0 0
      target/linux/patches/4.9.32/ld-or1k.patch
  21. 0 0
      target/linux/patches/4.9.32/macsonic.patch
  22. 0 0
      target/linux/patches/4.9.32/microblaze-sigaltstack.patch
  23. 0 0
      target/linux/patches/4.9.32/or1k-more-ram.patch
  24. 0 0
      target/linux/patches/4.9.32/patch-realtime
  25. 0 0
      target/linux/patches/4.9.32/sh2.patch
  26. 0 0
      target/linux/patches/4.9.32/startup.patch
  27. 0 0
      target/linux/patches/4.9.32/vdso2.patch

+ 6 - 6
mk/kernel-ver.mk

@@ -16,16 +16,16 @@ KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(ADK_TARGET_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_11),y)
-KERNEL_FILE_VER:=	4.11.4
+KERNEL_FILE_VER:=	4.11.5
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		83d4e60e6af7cb8449437f72ce0a6bc311ddcdd3dac2754f015e9b6b55448a90
+KERNEL_HASH:=		f7464c57e948a2597ea129c3f71909ccba7f02d297812cee74d694f823f16d4c
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_9),y)
-KERNEL_FILE_VER:=	4.9.31
+KERNEL_FILE_VER:=	4.9.32
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		28cad8b66216da2550155b7a77f37041bde40b821567d1b288e5e9fb6cca9856
+KERNEL_HASH:=		c3796575bbd2f55a1d1fb3f07b197b76afbb62dc1f64bd15d44626f78a610765
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_6),y)
 KERNEL_FILE_VER:=	4.6.2
@@ -34,10 +34,10 @@ KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		e158f3c69da87c2ec28d0f194dbe18b05e0d0b9e1142566615cea3390bab1c6a
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_4),y)
-KERNEL_FILE_VER:=	4.4.70
+KERNEL_FILE_VER:=	4.4.72
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		c0a8b36ca9044a91eccb475cc1c467cee1f5b296f30ca06db2b91e0589072dfa
+KERNEL_HASH:=		4133b41b855f58462301719d05d6d05ddb803d0117c8d57de352cb4d7835ede8
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_1),y)
 KERNEL_FILE_VER:=	4.1.39

+ 3 - 5
target/config/Config.in.kernelversion

@@ -14,7 +14,6 @@ default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS
 default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG
 default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
 default ADK_TARGET_KERNEL_VERSION_4_6 if ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64
-default ADK_TARGET_KERNEL_VERSION_4_11 if ADK_TARGET_ARCH_SPARC64
 default ADK_TARGET_KERNEL_VERSION_4_9
 
 config ADK_TARGET_KERNEL_VERSION_GIT
@@ -29,7 +28,7 @@ config ADK_TARGET_KERNEL_VERSION_GIT
 	select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 
 config ADK_TARGET_KERNEL_VERSION_4_11
-	bool "4.11.4"
+	bool "4.11.5"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_METAG
@@ -39,21 +38,20 @@ config ADK_TARGET_KERNEL_VERSION_4_11
 	depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
 
 config ADK_TARGET_KERNEL_VERSION_4_9
-	bool "4.9.31"
+	bool "4.9.32"
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_RISCV32
 	depends on !ADK_TARGET_ARCH_RISCV64
 	depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
-	depends on !ADK_TARGET_ARCH_SPARC64
 
 config ADK_TARGET_KERNEL_VERSION_4_6
 	bool "4.6.2"
 	depends on ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64
 
 config ADK_TARGET_KERNEL_VERSION_4_4
-	bool "4.4.70"
+	bool "4.4.72"
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_ARCH_OR1K

+ 0 - 70
target/linux/patches/4.11.4/0001-sparc64.patch

@@ -1,70 +0,0 @@
-From 1b4af13ff2cc6897557bb0b8d9e2fad4fa4d67aa Mon Sep 17 00:00:00 2001
-From: "David S. Miller" <davem@davemloft.net>
-Date: Mon, 5 Jun 2017 11:28:57 -0700
-Subject: [PATCH] sparc64: Add __multi3 for gcc 7.x and later.
-
-Reported-by: Waldemar Brodkorb <wbx@openadk.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- arch/sparc/lib/Makefile |  1 +
- arch/sparc/lib/multi3.S | 35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 36 insertions(+)
- create mode 100644 arch/sparc/lib/multi3.S
-
-diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
-index 69912d2..07c03e7 100644
---- a/arch/sparc/lib/Makefile
-+++ b/arch/sparc/lib/Makefile
-@@ -15,6 +15,7 @@ lib-$(CONFIG_SPARC32) += copy_user.o locks.o
- lib-$(CONFIG_SPARC64) += atomic_64.o
- lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o
- lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o
-+lib-$(CONFIG_SPARC64) += multi3.o
- 
- lib-$(CONFIG_SPARC64) += copy_page.o clear_page.o bzero.o
- lib-$(CONFIG_SPARC64) += csum_copy.o csum_copy_from_user.o csum_copy_to_user.o
-diff --git a/arch/sparc/lib/multi3.S b/arch/sparc/lib/multi3.S
-new file mode 100644
-index 0000000..d6b6c97
---- /dev/null
-+++ b/arch/sparc/lib/multi3.S
-@@ -0,0 +1,35 @@
-+#include <linux/linkage.h>
-+#include <asm/export.h>
-+
-+	.text
-+	.align	4
-+ENTRY(__multi3) /* %o0 = u, %o1 = v */
-+	mov	%o1, %g1
-+	srl	%o3, 0, %g4
-+	mulx	%g4, %g1, %o1
-+	srlx	%g1, 0x20, %g3
-+	mulx	%g3, %g4, %g5
-+	sllx	%g5, 0x20, %o5
-+	srl	%g1, 0, %g4
-+	sub	%o1, %o5, %o5
-+	srlx	%o5, 0x20, %o5
-+	addcc	%g5, %o5, %g5
-+	srlx	%o3, 0x20, %o5
-+	mulx	%g4, %o5, %g4
-+	mulx	%g3, %o5, %o5
-+	sethi	%hi(0x80000000), %g3
-+	addcc	%g5, %g4, %g5
-+	srlx	%g5, 0x20, %g5
-+	add	%g3, %g3, %g3
-+	movcc	%xcc, %g0, %g3
-+	addcc	%o5, %g5, %o5
-+	sllx	%g4, 0x20, %g4
-+	add	%o1, %g4, %o1
-+	add	%o5, %g3, %g2
-+	mulx	%g1, %o2, %g1
-+	add	%g1, %g2, %g1
-+	mulx	%o0, %o3, %o0
-+	retl
-+	 add	%g1, %o0, %o0
-+ENDPROC(__multi3)
-+EXPORT_SYMBOL(__multi3)
--- 
-2.1.2.532.g19b5d50
-
-

+ 41 - 0
target/linux/patches/4.4.72/0001-sparc64-make-string-buffers-large-enough.patch

@@ -0,0 +1,41 @@
+From b5c3206190f1fddd100b3060eb15f0d775ffeab8 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Fri, 25 Nov 2016 14:03:55 +0300
+Subject: [PATCH] sparc64: make string buffers large enough
+
+My static checker complains that if "lvl" is ULONG_MAX (this is 64 bit)
+then some of the strings will overflow.  I don't know if that's possible
+but it seems simple enough to make the buffers slightly larger.
+
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+---
+ arch/sparc/kernel/traps_64.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
+index 4094a51..496fa92 100644
+--- a/arch/sparc/kernel/traps_64.c
++++ b/arch/sparc/kernel/traps_64.c
+@@ -85,7 +85,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
+ 
+ void bad_trap(struct pt_regs *regs, long lvl)
+ {
+-	char buffer[32];
++	char buffer[36];
+ 	siginfo_t info;
+ 
+ 	if (notify_die(DIE_TRAP, "bad trap", regs,
+@@ -116,7 +116,7 @@ void bad_trap(struct pt_regs *regs, long lvl)
+ 
+ void bad_trap_tl1(struct pt_regs *regs, long lvl)
+ {
+-	char buffer[32];
++	char buffer[36];
+ 	
+ 	if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
+ 		       0, lvl, SIGTRAP) == NOTIFY_STOP)
+-- 
+2.1.4
+

+ 0 - 0
target/linux/patches/4.4.70/coldfire-sighandler.patch → target/linux/patches/4.4.72/coldfire-sighandler.patch


+ 0 - 0
target/linux/patches/4.4.70/crisv32.patch → target/linux/patches/4.4.72/crisv32.patch


+ 0 - 0
target/linux/patches/4.4.70/crisv32_ethernet_driver.patch → target/linux/patches/4.4.72/crisv32_ethernet_driver.patch


+ 0 - 0
target/linux/patches/4.4.70/initramfs-nosizelimit.patch → target/linux/patches/4.4.72/initramfs-nosizelimit.patch


+ 0 - 0
target/linux/patches/4.4.70/ld-or1k.patch → target/linux/patches/4.4.72/ld-or1k.patch


+ 0 - 0
target/linux/patches/4.4.70/macsonic.patch → target/linux/patches/4.4.72/macsonic.patch


+ 0 - 0
target/linux/patches/4.4.70/mips-xz.patch → target/linux/patches/4.4.72/mips-xz.patch


+ 0 - 0
target/linux/patches/4.4.70/patch-realtime → target/linux/patches/4.4.72/patch-realtime


+ 0 - 0
target/linux/patches/4.4.70/startup.patch → target/linux/patches/4.4.72/startup.patch


+ 0 - 0
target/linux/patches/4.4.70/use-libgcc-for-sh.patch → target/linux/patches/4.4.72/use-libgcc-for-sh.patch


+ 0 - 0
target/linux/patches/4.4.70/versatile-nommu.patch → target/linux/patches/4.4.72/versatile-nommu.patch


+ 41 - 0
target/linux/patches/4.9.32/0001-sparc64-make-string-buffers-large-enough.patch

@@ -0,0 +1,41 @@
+From b5c3206190f1fddd100b3060eb15f0d775ffeab8 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Fri, 25 Nov 2016 14:03:55 +0300
+Subject: [PATCH] sparc64: make string buffers large enough
+
+My static checker complains that if "lvl" is ULONG_MAX (this is 64 bit)
+then some of the strings will overflow.  I don't know if that's possible
+but it seems simple enough to make the buffers slightly larger.
+
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+---
+ arch/sparc/kernel/traps_64.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
+index 4094a51..496fa92 100644
+--- a/arch/sparc/kernel/traps_64.c
++++ b/arch/sparc/kernel/traps_64.c
+@@ -85,7 +85,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
+ 
+ void bad_trap(struct pt_regs *regs, long lvl)
+ {
+-	char buffer[32];
++	char buffer[36];
+ 	siginfo_t info;
+ 
+ 	if (notify_die(DIE_TRAP, "bad trap", regs,
+@@ -116,7 +116,7 @@ void bad_trap(struct pt_regs *regs, long lvl)
+ 
+ void bad_trap_tl1(struct pt_regs *regs, long lvl)
+ {
+-	char buffer[32];
++	char buffer[36];
+ 	
+ 	if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
+ 		       0, lvl, SIGTRAP) == NOTIFY_STOP)
+-- 
+2.1.4
+

+ 0 - 0
target/linux/patches/4.9.31/crisv32_ethernet_driver.patch → target/linux/patches/4.9.32/crisv32_ethernet_driver.patch


+ 0 - 0
target/linux/patches/4.9.31/h8300.patch → target/linux/patches/4.9.32/h8300.patch


+ 0 - 0
target/linux/patches/4.9.31/initramfs-nosizelimit.patch → target/linux/patches/4.9.32/initramfs-nosizelimit.patch


+ 0 - 0
target/linux/patches/4.9.31/ld-or1k.patch → target/linux/patches/4.9.32/ld-or1k.patch


+ 0 - 0
target/linux/patches/4.9.31/macsonic.patch → target/linux/patches/4.9.32/macsonic.patch


+ 0 - 0
target/linux/patches/4.9.31/microblaze-sigaltstack.patch → target/linux/patches/4.9.32/microblaze-sigaltstack.patch


+ 0 - 0
target/linux/patches/4.9.31/or1k-more-ram.patch → target/linux/patches/4.9.32/or1k-more-ram.patch


+ 0 - 0
target/linux/patches/4.9.31/patch-realtime → target/linux/patches/4.9.32/patch-realtime


+ 0 - 0
target/linux/patches/4.9.31/sh2.patch → target/linux/patches/4.9.32/sh2.patch


+ 0 - 0
target/linux/patches/4.9.31/startup.patch → target/linux/patches/4.9.32/startup.patch


+ 0 - 0
target/linux/patches/4.9.31/vdso2.patch → target/linux/patches/4.9.32/vdso2.patch