From 140d1de488a81e2074831810577d43baf85b4062 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 17 Mar 2018 20:48:40 +0100 Subject: linux: update to 4.14.27 --- target/linux/patches/4.14.24/h8300.patch | 12 -------- .../patches/4.14.24/initramfs-nosizelimit.patch | 21 ------------- target/linux/patches/4.14.24/or1k-more-ram.patch | 12 -------- target/linux/patches/4.14.24/startup.patch | 34 ---------------------- target/linux/patches/4.14.27/h8300.patch | 12 ++++++++ .../patches/4.14.27/initramfs-nosizelimit.patch | 21 +++++++++++++ target/linux/patches/4.14.27/or1k-more-ram.patch | 12 ++++++++ target/linux/patches/4.14.27/startup.patch | 34 ++++++++++++++++++++++ 8 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 target/linux/patches/4.14.24/h8300.patch delete mode 100644 target/linux/patches/4.14.24/initramfs-nosizelimit.patch delete mode 100644 target/linux/patches/4.14.24/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.14.24/startup.patch create mode 100644 target/linux/patches/4.14.27/h8300.patch create mode 100644 target/linux/patches/4.14.27/initramfs-nosizelimit.patch create mode 100644 target/linux/patches/4.14.27/or1k-more-ram.patch create mode 100644 target/linux/patches/4.14.27/startup.patch (limited to 'target/linux/patches') diff --git a/target/linux/patches/4.14.24/h8300.patch b/target/linux/patches/4.14.24/h8300.patch deleted file mode 100644 index 836a414e5..000000000 --- a/target/linux/patches/4.14.24/h8300.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.13.2.orig/arch/h8300/Kconfig.cpu linux-4.13.2/arch/h8300/Kconfig.cpu ---- linux-4.13.2.orig/arch/h8300/Kconfig.cpu 2017-09-13 23:21:49.000000000 +0200 -+++ linux-4.13.2/arch/h8300/Kconfig.cpu 2017-09-16 18:32:15.263759679 +0200 -@@ -96,4 +96,8 @@ - hex "Load offset" - default 0 - -+config RAMBASE -+ hex "RAM base address" -+ default 0x400000 -+ - endmenu diff --git a/target/linux/patches/4.14.24/initramfs-nosizelimit.patch b/target/linux/patches/4.14.24/initramfs-nosizelimit.patch deleted file mode 100644 index 0e524c1d9..000000000 --- a/target/linux/patches/4.14.24/initramfs-nosizelimit.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur linux-4.14.24.orig/init/do_mounts.c linux-4.14.24/init/do_mounts.c ---- linux-4.14.24.orig/init/do_mounts.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/do_mounts.c 2018-03-08 02:32:01.136927457 +0100 -@@ -604,6 +604,7 @@ - } - - static bool is_tmpfs; -+static char tmpfs_rootflags[] = "nr_blocks=0,nr_inodes=0"; - static struct dentry *rootfs_mount(struct file_system_type *fs_type, - int flags, const char *dev_name, void *data) - { -@@ -616,6 +617,9 @@ - if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs) - fill = shmem_fill_super; - -+ if (is_tmpfs) -+ data = tmpfs_rootflags; -+ - return mount_nodev(fs_type, flags, data, fill); - } - diff --git a/target/linux/patches/4.14.24/or1k-more-ram.patch b/target/linux/patches/4.14.24/or1k-more-ram.patch deleted file mode 100644 index de848c838..000000000 --- a/target/linux/patches/4.14.24/or1k-more-ram.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts ---- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 -+++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 -@@ -11,7 +11,7 @@ - - memory@0 { - device_type = "memory"; -- reg = <0x00000000 0x02000000>; -+ reg = <0x00000000 0x04000000>; - }; - - cpus { diff --git a/target/linux/patches/4.14.24/startup.patch b/target/linux/patches/4.14.24/startup.patch deleted file mode 100644 index bac354728..000000000 --- a/target/linux/patches/4.14.24/startup.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nur linux-4.14.24.orig/init/initramfs.c linux-4.14.24/init/initramfs.c ---- linux-4.14.24.orig/init/initramfs.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/initramfs.c 2018-03-08 06:51:14.808479805 +0100 -@@ -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.14.24.orig/init/main.c linux-4.14.24/init/main.c ---- linux-4.14.24.orig/init/main.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/main.c 2018-03-08 06:15:19.961419100 +0100 -@@ -1069,6 +1069,8 @@ - if (sys_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) sys_dup(0); - (void) sys_dup(0); - /* -@@ -1077,7 +1079,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { - ramdisk_execute_command = NULL; diff --git a/target/linux/patches/4.14.27/h8300.patch b/target/linux/patches/4.14.27/h8300.patch new file mode 100644 index 000000000..836a414e5 --- /dev/null +++ b/target/linux/patches/4.14.27/h8300.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.13.2.orig/arch/h8300/Kconfig.cpu linux-4.13.2/arch/h8300/Kconfig.cpu +--- linux-4.13.2.orig/arch/h8300/Kconfig.cpu 2017-09-13 23:21:49.000000000 +0200 ++++ linux-4.13.2/arch/h8300/Kconfig.cpu 2017-09-16 18:32:15.263759679 +0200 +@@ -96,4 +96,8 @@ + hex "Load offset" + default 0 + ++config RAMBASE ++ hex "RAM base address" ++ default 0x400000 ++ + endmenu diff --git a/target/linux/patches/4.14.27/initramfs-nosizelimit.patch b/target/linux/patches/4.14.27/initramfs-nosizelimit.patch new file mode 100644 index 000000000..0e524c1d9 --- /dev/null +++ b/target/linux/patches/4.14.27/initramfs-nosizelimit.patch @@ -0,0 +1,21 @@ +diff -Nur linux-4.14.24.orig/init/do_mounts.c linux-4.14.24/init/do_mounts.c +--- linux-4.14.24.orig/init/do_mounts.c 2018-03-03 10:24:39.000000000 +0100 ++++ linux-4.14.24/init/do_mounts.c 2018-03-08 02:32:01.136927457 +0100 +@@ -604,6 +604,7 @@ + } + + static bool is_tmpfs; ++static char tmpfs_rootflags[] = "nr_blocks=0,nr_inodes=0"; + static struct dentry *rootfs_mount(struct file_system_type *fs_type, + int flags, const char *dev_name, void *data) + { +@@ -616,6 +617,9 @@ + if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs) + fill = shmem_fill_super; + ++ if (is_tmpfs) ++ data = tmpfs_rootflags; ++ + return mount_nodev(fs_type, flags, data, fill); + } + diff --git a/target/linux/patches/4.14.27/or1k-more-ram.patch b/target/linux/patches/4.14.27/or1k-more-ram.patch new file mode 100644 index 000000000..de848c838 --- /dev/null +++ b/target/linux/patches/4.14.27/or1k-more-ram.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts +--- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 ++++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 +@@ -11,7 +11,7 @@ + + memory@0 { + device_type = "memory"; +- reg = <0x00000000 0x02000000>; ++ reg = <0x00000000 0x04000000>; + }; + + cpus { diff --git a/target/linux/patches/4.14.27/startup.patch b/target/linux/patches/4.14.27/startup.patch new file mode 100644 index 000000000..bac354728 --- /dev/null +++ b/target/linux/patches/4.14.27/startup.patch @@ -0,0 +1,34 @@ +diff -Nur linux-4.14.24.orig/init/initramfs.c linux-4.14.24/init/initramfs.c +--- linux-4.14.24.orig/init/initramfs.c 2018-03-03 10:24:39.000000000 +0100 ++++ linux-4.14.24/init/initramfs.c 2018-03-08 06:51:14.808479805 +0100 +@@ -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.14.24.orig/init/main.c linux-4.14.24/init/main.c +--- linux-4.14.24.orig/init/main.c 2018-03-03 10:24:39.000000000 +0100 ++++ linux-4.14.24/init/main.c 2018-03-08 06:15:19.961419100 +0100 +@@ -1069,6 +1069,8 @@ + if (sys_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) sys_dup(0); + (void) sys_dup(0); + /* +@@ -1077,7 +1079,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { + ramdisk_execute_command = NULL; -- cgit v1.2.3