linux: update kernel to 4.4.5

5 files changed, 31 insertions, 11 deletions

diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 776b6ab11..ec2b00141 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -19,11 +19,11 @@ endif
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_4_3),y)
-KERNEL_FILE_VER:=	4.4.3
+ifeq ($(ADK_TARGET_KERNEL_VERSION_4_4_5),y)
+KERNEL_FILE_VER:=	4.4.5
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		0b379cb19bbd7e38fc5a9a000ea927db55cce519a7400ec7fa705c581a6491dd
+KERNEL_HASH:=		30219a84d90286dce26f149613eb612438ce42753f0628a32a88ea2a64de4ab5
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_1_16),y)
 KERNEL_FILE_VER:=	4.1.16
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index e8574f1a9..3f9de09ad 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -4,19 +4,14 @@
 choice
 prompt "Kernel version" if !ADK_TARGET_CHOOSE_ARCH
 depends on ADK_TARGET_OS_LINUX
-default ADK_TARGET_KERNEL_VERSION_4_4_3 if ADK_TARGET_ARCH_ARC
-default ADK_TARGET_KERNEL_VERSION_4_4_3 if ADK_TARGET_ARCH_SPARC
-default ADK_TARGET_KERNEL_VERSION_4_4_3 if ADK_TARGET_ARCH_BFIN
-default ADK_TARGET_KERNEL_VERSION_4_4_3 if ADK_TARGET_ARCH_H8300
-default ADK_TARGET_KERNEL_VERSION_4_4_3 if ADK_TARGET_ARCH_PPC64
 default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_WITHOUT_MMU && ADK_TARGET_ARCH_XTENSA
-default ADK_TARGET_KERNEL_VERSION_4_1_16
+default ADK_TARGET_KERNEL_VERSION_4_4_5
 
 config ADK_TARGET_KERNEL_VERSION_GIT
 	bool "linux-git"
 
-config ADK_TARGET_KERNEL_VERSION_4_4_3
-	bool "4.4.3"
+config ADK_TARGET_KERNEL_VERSION_4_4_5
+	bool "4.4.5"
 	select ADK_TARGET_KERNEL_VERSION_4_4
 
 config ADK_TARGET_KERNEL_VERSION_4_1_16
diff --git a/target/cris/kernel/qemu-cris b/target/cris/kernel/qemu-cris
index 82f3d11aa..3591f23b8 100644
--- a/target/cris/kernel/qemu-cris
+++ b/target/cris/kernel/qemu-cris
@@ -41,3 +41,4 @@ CONFIG_ETRAX_SERIAL_PORT1_DMA5_IN=y
 CONFIG_ETRAX_SERIAL_PORT1_DMA4_OUT=y
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
diff --git a/target/linux/patches/4.4.5/ld-or1k.patch b/target/linux/patches/4.4.5/ld-or1k.patch
new file mode 100644
index 000000000..264f9166f
--- /dev/null
+++ b/target/linux/patches/4.4.5/ld-or1k.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-4.4.5.orig/arch/openrisc/kernel/vmlinux.lds.S linux-4.4.5/arch/openrisc/kernel/vmlinux.lds.S
+--- linux-4.4.5.orig/arch/openrisc/kernel/vmlinux.lds.S	2016-03-10 00:35:58.000000000 +0100
++++ linux-4.4.5/arch/openrisc/kernel/vmlinux.lds.S	2016-03-16 09:21:07.933535532 +0100
+@@ -30,7 +30,7 @@
+ #include <asm/cache.h>
+ #include <asm-generic/vmlinux.lds.h>
+ 
+-OUTPUT_FORMAT("elf32-or32", "elf32-or32", "elf32-or32")
++OUTPUT_FORMAT("elf32-or1k", "elf32-or1k", "elf32-or1k")
+ jiffies = jiffies_64 + 4;
+ 
+ SECTIONS
diff --git a/target/linux/patches/4.4.5/mips-xz.patch b/target/linux/patches/4.4.5/mips-xz.patch
new file mode 100644
index 000000000..5cfac6254
--- /dev/null
+++ b/target/linux/patches/4.4.5/mips-xz.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-4.4.5.orig/arch/mips/boot/compressed/Makefile linux-4.4.5/arch/mips/boot/compressed/Makefile
+--- linux-4.4.5.orig/arch/mips/boot/compressed/Makefile	2016-03-10 00:35:58.000000000 +0100
++++ linux-4.4.5/arch/mips/boot/compressed/Makefile	2016-03-15 11:35:31.951795457 +0100
+@@ -41,7 +41,7 @@
+ endif
+ 
+ ifdef CONFIG_KERNEL_XZ
+-vmlinuzobjs-y += $(obj)/../../lib/ashldi3.o
++vmlinuzobjs-y += $(obj)/../../lib/ashldi3.o $(obj)/../../lib/bswapsi.o
+ endif
+ 
+ targets += vmlinux.bin