summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2018-03-08 02:13:11 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2018-03-08 02:13:11 +0100
commit8fd73e994cb518f4288cdc18df26d19a18ba4961 (patch)
tree1d0a887521a88fc7d97311d467cbeef0e518ba0f
parentd5193809c182eb1e9914e3609b8cbe47f61545c2 (diff)
linux: update to 4.9.86
-rw-r--r--mk/linux-ver.mk4
-rw-r--r--target/linux/Config.in.kernelversion2
-rw-r--r--target/linux/patches/4.9.77/mips64r6-multi3.patch107
-rw-r--r--target/linux/patches/4.9.86/alpha-remove-coff.patch (renamed from target/linux/patches/4.9.77/alpha-remove-coff.patch)0
-rw-r--r--target/linux/patches/4.9.86/crisv32_ethernet_driver.patch (renamed from target/linux/patches/4.9.77/crisv32_ethernet_driver.patch)0
-rw-r--r--target/linux/patches/4.9.86/h8300.patch (renamed from target/linux/patches/4.9.77/h8300.patch)0
-rw-r--r--target/linux/patches/4.9.86/initramfs-nosizelimit.patch (renamed from target/linux/patches/4.9.77/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/4.9.86/ld-or1k.patch (renamed from target/linux/patches/4.9.77/ld-or1k.patch)0
-rw-r--r--target/linux/patches/4.9.86/macsonic.patch (renamed from target/linux/patches/4.9.77/macsonic.patch)0
-rw-r--r--target/linux/patches/4.9.86/microblaze-sigaltstack.patch (renamed from target/linux/patches/4.9.77/microblaze-sigaltstack.patch)0
-rw-r--r--target/linux/patches/4.9.86/or1k-more-ram.patch (renamed from target/linux/patches/4.9.77/or1k-more-ram.patch)0
-rw-r--r--target/linux/patches/4.9.86/patch-realtime (renamed from target/linux/patches/4.9.77/patch-realtime)0
-rw-r--r--target/linux/patches/4.9.86/sh2.patch (renamed from target/linux/patches/4.9.77/sh2.patch)0
-rw-r--r--target/linux/patches/4.9.86/startup.patch (renamed from target/linux/patches/4.9.77/startup.patch)0
-rw-r--r--target/linux/patches/4.9.86/vdso2.patch (renamed from target/linux/patches/4.9.77/vdso2.patch)0
15 files changed, 3 insertions, 110 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index ec54a236f..2ff3cd733 100644
--- a/mk/linux-ver.mk
+++ b/mk/linux-ver.mk
@@ -28,10 +28,10 @@ KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
KERNEL_HASH:= 6ebcc57ba31d714af872347184d1de32f4ab0b7096ef4e062d1ca6b3234d9333
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_9),y)
-KERNEL_FILE_VER:= 4.9.77
+KERNEL_FILE_VER:= 4.9.86
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= 7c29bc3fb96f1e23d98f664e786dddd53a1599f56431b9b7fdfba402a4b3705c
+KERNEL_HASH:= a7cf6eb5efcf182f1760fdfc06118eecce5d8c9d82d6945e68fc15db990c6e85
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_4),y)
KERNEL_FILE_VER:= 4.4.112
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 1970069ea..5ef5cf1ee 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -56,7 +56,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_14
depends on !ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
config ADK_TARGET_LINUX_KERNEL_VERSION_4_9
- bool "4.9.77"
+ bool "4.9.86"
depends on !ADK_TARGET_ARCH_CRIS
depends on !ADK_TARGET_ARCH_CSKY
depends on !ADK_TARGET_ARCH_METAG
diff --git a/target/linux/patches/4.9.77/mips64r6-multi3.patch b/target/linux/patches/4.9.77/mips64r6-multi3.patch
deleted file mode 100644
index 771febe29..000000000
--- a/target/linux/patches/4.9.77/mips64r6-multi3.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-MIPS: Implement __multi3 for GCC7 MIPS64r6 builds
-
-Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: James Hogan <jhogan@kernel.org>
-
-diff -Nur linux-4.9.71.orig/arch/mips/lib/libgcc.h linux-4.9.71/arch/mips/lib/libgcc.h
---- linux-4.9.71.orig/arch/mips/lib/libgcc.h 2017-12-20 10:07:34.000000000 +0100
-+++ linux-4.9.71/arch/mips/lib/libgcc.h 2017-12-25 16:08:31.476051643 +0100
-@@ -9,10 +9,18 @@
- struct DWstruct {
- int high, low;
- };
-+
-+struct TWstruct {
-+ long long high, low;
-+};
- #elif defined(__LITTLE_ENDIAN)
- struct DWstruct {
- int low, high;
- };
-+
-+struct TWstruct {
-+ long long low, high;
-+};
- #else
- #error I feel sick.
- #endif
-@@ -22,4 +30,13 @@
- long long ll;
- } DWunion;
-
-+#if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPSR6)
-+typedef int ti_type __attribute__((mode(TI)));
-+
-+typedef union {
-+ struct TWstruct s;
-+ ti_type ti;
-+} TWunion;
-+#endif
-+
- #endif /* __ASM_LIBGCC_H */
-diff -Nur linux-4.9.71.orig/arch/mips/lib/Makefile linux-4.9.71/arch/mips/lib/Makefile
---- linux-4.9.71.orig/arch/mips/lib/Makefile 2017-12-20 10:07:34.000000000 +0100
-+++ linux-4.9.71/arch/mips/lib/Makefile 2017-12-25 16:08:31.476051643 +0100
-@@ -15,4 +15,5 @@
- obj-$(CONFIG_CPU_TX39XX) += r3k_dump_tlb.o
-
- # libgcc-style stuff needed in the kernel
--obj-y += ashldi3.o ashrdi3.o bswapsi.o bswapdi.o cmpdi2.o lshrdi3.o ucmpdi2.o
-+obj-y += ashldi3.o ashrdi3.o bswapsi.o bswapdi.o cmpdi2.o lshrdi3.o multi3.o \
-+ ucmpdi2.o
-diff -Nur linux-4.9.71.orig/arch/mips/lib/multi3.c linux-4.9.71/arch/mips/lib/multi3.c
---- linux-4.9.71.orig/arch/mips/lib/multi3.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.71/arch/mips/lib/multi3.c 2017-12-25 16:08:31.476051643 +0100
-@@ -0,0 +1,52 @@
-+// SPDX-License-Identifier: GPL-2.0
-+#include <linux/export.h>
-+
-+#include "libgcc.h"
-+
-+/*
-+ * GCC 7 suboptimally generates __multi3 calls for mips64r6, so for that
-+ * specific case only we'll implement it here.
-+ *
-+ * See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82981
-+ */
-+#if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPSR6) && (__GNUC__ == 7)
-+
-+/* multiply 64-bit values, low 64-bits returned */
-+static inline long long notrace dmulu(long long a, long long b)
-+{
-+ long long res;
-+ asm ("dmulu %0,%1,%2" : "=r" (res) : "r" (a), "r" (b));
-+ return res;
-+}
-+
-+/* multiply 64-bit unsigned values, high 64-bits of 128-bit result returned */
-+static inline long long notrace dmuhu(long long a, long long b)
-+{
-+ long long res;
-+ asm ("dmuhu %0,%1,%2" : "=r" (res) : "r" (a), "r" (b));
-+ return res;
-+}
-+
-+/* multiply 128-bit values, low 128-bits returned */
-+ti_type notrace __multi3(ti_type a, ti_type b)
-+{
-+ TWunion res, aa, bb;
-+
-+ aa.ti = a;
-+ bb.ti = b;
-+
-+ /*
-+ * a * b = (a.lo * b.lo)
-+ * + 2^64 * (a.hi * b.lo + a.lo * b.hi)
-+ * [+ 2^128 * (a.hi * b.hi)]
-+ */
-+ res.s.low = dmulu(aa.s.low, bb.s.low);
-+ res.s.high = dmuhu(aa.s.low, bb.s.low);
-+ res.s.high += dmulu(aa.s.high, bb.s.low);
-+ res.s.high += dmulu(aa.s.low, bb.s.high);
-+
-+ return res.ti;
-+}
-+EXPORT_SYMBOL(__multi3);
-+
-+#endif /* 64BIT && CPU_MIPSR6 && GCC7 */
diff --git a/target/linux/patches/4.9.77/alpha-remove-coff.patch b/target/linux/patches/4.9.86/alpha-remove-coff.patch
index 176db3c88..176db3c88 100644
--- a/target/linux/patches/4.9.77/alpha-remove-coff.patch
+++ b/target/linux/patches/4.9.86/alpha-remove-coff.patch
diff --git a/target/linux/patches/4.9.77/crisv32_ethernet_driver.patch b/target/linux/patches/4.9.86/crisv32_ethernet_driver.patch
index 0cef202fc..0cef202fc 100644
--- a/target/linux/patches/4.9.77/crisv32_ethernet_driver.patch
+++ b/target/linux/patches/4.9.86/crisv32_ethernet_driver.patch
diff --git a/target/linux/patches/4.9.77/h8300.patch b/target/linux/patches/4.9.86/h8300.patch
index c71194f0a..c71194f0a 100644
--- a/target/linux/patches/4.9.77/h8300.patch
+++ b/target/linux/patches/4.9.86/h8300.patch
diff --git a/target/linux/patches/4.9.77/initramfs-nosizelimit.patch b/target/linux/patches/4.9.86/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/4.9.77/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.9.86/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.9.77/ld-or1k.patch b/target/linux/patches/4.9.86/ld-or1k.patch
index 264f9166f..264f9166f 100644
--- a/target/linux/patches/4.9.77/ld-or1k.patch
+++ b/target/linux/patches/4.9.86/ld-or1k.patch
diff --git a/target/linux/patches/4.9.77/macsonic.patch b/target/linux/patches/4.9.86/macsonic.patch
index 75a6fcad2..75a6fcad2 100644
--- a/target/linux/patches/4.9.77/macsonic.patch
+++ b/target/linux/patches/4.9.86/macsonic.patch
diff --git a/target/linux/patches/4.9.77/microblaze-sigaltstack.patch b/target/linux/patches/4.9.86/microblaze-sigaltstack.patch
index c4064e8b9..c4064e8b9 100644
--- a/target/linux/patches/4.9.77/microblaze-sigaltstack.patch
+++ b/target/linux/patches/4.9.86/microblaze-sigaltstack.patch
diff --git a/target/linux/patches/4.9.77/or1k-more-ram.patch b/target/linux/patches/4.9.86/or1k-more-ram.patch
index de848c838..de848c838 100644
--- a/target/linux/patches/4.9.77/or1k-more-ram.patch
+++ b/target/linux/patches/4.9.86/or1k-more-ram.patch
diff --git a/target/linux/patches/4.9.77/patch-realtime b/target/linux/patches/4.9.86/patch-realtime
index 7bb72e14d..7bb72e14d 100644
--- a/target/linux/patches/4.9.77/patch-realtime
+++ b/target/linux/patches/4.9.86/patch-realtime
diff --git a/target/linux/patches/4.9.77/sh2.patch b/target/linux/patches/4.9.86/sh2.patch
index 9debe80ad..9debe80ad 100644
--- a/target/linux/patches/4.9.77/sh2.patch
+++ b/target/linux/patches/4.9.86/sh2.patch
diff --git a/target/linux/patches/4.9.77/startup.patch b/target/linux/patches/4.9.86/startup.patch
index e54ac19a6..e54ac19a6 100644
--- a/target/linux/patches/4.9.77/startup.patch
+++ b/target/linux/patches/4.9.86/startup.patch
diff --git a/target/linux/patches/4.9.77/vdso2.patch b/target/linux/patches/4.9.86/vdso2.patch
index 35df488a8..35df488a8 100644
--- a/target/linux/patches/4.9.77/vdso2.patch
+++ b/target/linux/patches/4.9.86/vdso2.patch