From 0048544c405c549f6ef1f656166b5fdd0baa00e2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 27 Aug 2018 18:57:46 +0200 Subject: linux: update to 4.18.5 --- target/linux/Config.in.kernelversion | 16 +++------------ target/linux/patches/4.17.2/arc.patch | 12 ----------- target/linux/patches/4.17.2/startup.patch | 34 ------------------------------- target/linux/patches/4.18.5/arc.patch | 12 +++++++++++ target/linux/patches/4.18.5/startup.patch | 34 +++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 59 deletions(-) delete mode 100644 target/linux/patches/4.17.2/arc.patch delete mode 100644 target/linux/patches/4.17.2/startup.patch create mode 100644 target/linux/patches/4.18.5/arc.patch create mode 100644 target/linux/patches/4.18.5/startup.patch (limited to 'target') diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index c81f507b7..baaafe711 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -16,7 +16,7 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_RISCV64 default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_H8300 default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG -default ADK_TARGET_LINUX_KERNEL_VERSION_4_17 if ADK_TARGET_ARCH_ARC +default ADK_TARGET_LINUX_KERNEL_VERSION_4_18 if ADK_TARGET_ARCH_ARC default ADK_TARGET_LINUX_KERNEL_VERSION_4_14 config ADK_TARGET_LINUX_KERNEL_VERSION_GIT @@ -29,8 +29,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK -config ADK_TARGET_LINUX_KERNEL_VERSION_4_17 - bool "4.17.2" +config ADK_TARGET_LINUX_KERNEL_VERSION_4_18 + bool "4.18.5" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_CSKY @@ -38,16 +38,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_17 depends on !ADK_TARGET_ARCH_RISCV32 depends on !ADK_TARGET_ARCH_RISCV64 -config ADK_TARGET_LINUX_KERNEL_VERSION_4_16 - bool "4.16.17" - depends on !ADK_TARGET_ARCH_AVR32 - depends on !ADK_TARGET_ARCH_CRIS - depends on !ADK_TARGET_ARCH_CSKY - depends on !ADK_TARGET_ARCH_METAG - depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_ARCH_RISCV32 - depends on !ADK_TARGET_ARCH_RISCV64 - config ADK_TARGET_LINUX_KERNEL_VERSION_4_14 bool "4.14.44" depends on !ADK_TARGET_ARCH_AVR32 diff --git a/target/linux/patches/4.17.2/arc.patch b/target/linux/patches/4.17.2/arc.patch deleted file mode 100644 index 20810ce64..000000000 --- a/target/linux/patches/4.17.2/arc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.17.1.orig/arch/arc/boot/Makefile linux-4.17.1/arch/arc/boot/Makefile ---- linux-4.17.1.orig/arch/arc/boot/Makefile 2018-06-11 22:43:19.000000000 +0200 -+++ linux-4.17.1/arch/arc/boot/Makefile 2018-06-16 18:28:02.000000000 +0200 -@@ -7,7 +7,7 @@ - - OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S - --LINUX_START_TEXT = $$(readelf -h vmlinux | \ -+LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \ - grep "Entry point address" | grep -o 0x.*) - - UIMAGE_LOADADDR = $(CONFIG_LINUX_LINK_BASE) diff --git a/target/linux/patches/4.17.2/startup.patch b/target/linux/patches/4.17.2/startup.patch deleted file mode 100644 index dd27de856..000000000 --- a/target/linux/patches/4.17.2/startup.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nur linux-4.17.orig/init/initramfs.c linux-4.17/init/initramfs.c ---- linux-4.17.orig/init/initramfs.c 2018-06-03 23:15:21.000000000 +0200 -+++ linux-4.17/init/initramfs.c 2018-06-10 17:01:16.000000000 +0200 -@@ -659,6 +659,9 @@ - * us a chance to load before device_initcalls. - */ - load_default_modules(); -+#ifdef CONFIG_DEVTMPFS_MOUNT -+ devtmpfs_mount("dev"); -+#endif - - return 0; - } -diff -Nur linux-4.17.orig/init/main.c linux-4.17/init/main.c ---- linux-4.17.orig/init/main.c 2018-06-03 23:15:21.000000000 +0200 -+++ linux-4.17/init/main.c 2018-06-10 17:01:52.000000000 +0200 -@@ -1138,6 +1138,8 @@ - if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) - pr_err("Warning: unable to open an initial console.\n"); - -+ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); -+ - (void) ksys_dup(0); - (void) ksys_dup(0); - /* -@@ -1146,7 +1148,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (ksys_access((const char __user *) - ramdisk_execute_command, 0) != 0) { diff --git a/target/linux/patches/4.18.5/arc.patch b/target/linux/patches/4.18.5/arc.patch new file mode 100644 index 000000000..20810ce64 --- /dev/null +++ b/target/linux/patches/4.18.5/arc.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.17.1.orig/arch/arc/boot/Makefile linux-4.17.1/arch/arc/boot/Makefile +--- linux-4.17.1.orig/arch/arc/boot/Makefile 2018-06-11 22:43:19.000000000 +0200 ++++ linux-4.17.1/arch/arc/boot/Makefile 2018-06-16 18:28:02.000000000 +0200 +@@ -7,7 +7,7 @@ + + OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S + +-LINUX_START_TEXT = $$(readelf -h vmlinux | \ ++LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \ + grep "Entry point address" | grep -o 0x.*) + + UIMAGE_LOADADDR = $(CONFIG_LINUX_LINK_BASE) diff --git a/target/linux/patches/4.18.5/startup.patch b/target/linux/patches/4.18.5/startup.patch new file mode 100644 index 000000000..dd27de856 --- /dev/null +++ b/target/linux/patches/4.18.5/startup.patch @@ -0,0 +1,34 @@ +diff -Nur linux-4.17.orig/init/initramfs.c linux-4.17/init/initramfs.c +--- linux-4.17.orig/init/initramfs.c 2018-06-03 23:15:21.000000000 +0200 ++++ linux-4.17/init/initramfs.c 2018-06-10 17:01:16.000000000 +0200 +@@ -659,6 +659,9 @@ + * us a chance to load before device_initcalls. + */ + load_default_modules(); ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + + return 0; + } +diff -Nur linux-4.17.orig/init/main.c linux-4.17/init/main.c +--- linux-4.17.orig/init/main.c 2018-06-03 23:15:21.000000000 +0200 ++++ linux-4.17/init/main.c 2018-06-10 17:01:52.000000000 +0200 +@@ -1138,6 +1138,8 @@ + if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) + pr_err("Warning: unable to open an initial console.\n"); + ++ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); ++ + (void) ksys_dup(0); + (void) ksys_dup(0); + /* +@@ -1146,7 +1148,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (ksys_access((const char __user *) + ramdisk_execute_command, 0) != 0) { -- cgit v1.2.3