linux: update 4.14/4.15

5 files changed, 160 insertions, 0 deletions

diff --git a/target/linux/patches/4.14.32/arm-nommu.patch b/target/linux/patches/4.14.32/arm-nommu.patch
new file mode 100644
index 000000000..b91aaf712
--- /dev/null
+++ b/target/linux/patches/4.14.32/arm-nommu.patch
@@ -0,0 +1,81 @@
+diff -Nur linux-4.14.30.orig/arch/arm/Kconfig linux-4.14.30/arch/arm/Kconfig
+--- linux-4.14.30.orig/arch/arm/Kconfig	2018-03-24 11:01:30.000000000 +0100
++++ linux-4.14.30/arch/arm/Kconfig	2018-04-01 04:14:15.989043313 +0100
+@@ -363,6 +363,17 @@
+ 	select SPARSE_IRQ
+ 	select USE_OF
+ 
++config ARM_SINGLE_ARCH_VERSATILE
++	bool "ARM Ltd. Versatile family"
++	depends on !MMU
++	select AUTO_ZRELADDR
++	select CLKSRC_OF
++	select COMMON_CLK
++	select GENERIC_CLOCKEVENTS
++	select GPIOLIB
++	select SPARSE_IRQ
++	select USE_OF
++
+ config ARCH_EBSA110
+ 	bool "EBSA-110"
+ 	select ARCH_USES_GETTIMEOFFSET
+diff -Nur linux-4.14.30.orig/arch/arm/Kconfig.debug linux-4.14.30/arch/arm/Kconfig.debug
+--- linux-4.14.30.orig/arch/arm/Kconfig.debug	2018-03-24 11:01:30.000000000 +0100
++++ linux-4.14.30/arch/arm/Kconfig.debug	2018-04-01 04:14:15.990043300 +0100
+@@ -1777,7 +1777,8 @@
+ config UNCOMPRESS_INCLUDE
+ 	string
+ 	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
+-					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
++					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \
++					ARM_SINGLE_ARCH_VERSATILE
+ 	default "mach/uncompress.h"
+ 
+ config EARLY_PRINTK
+diff -Nur linux-4.14.30.orig/arch/arm/include/asm/mach/map.h linux-4.14.30/arch/arm/include/asm/mach/map.h
+--- linux-4.14.30.orig/arch/arm/include/asm/mach/map.h	2018-03-24 11:01:30.000000000 +0100
++++ linux-4.14.30/arch/arm/include/asm/mach/map.h	2018-04-01 04:14:15.991043288 +0100
+@@ -62,6 +62,7 @@
+ #else
+ #define iotable_init(map,num)	do { } while (0)
+ #define vm_reserve_area_early(a,s,c)	do { } while (0)
++#define debug_ll_io_init()	do { } while (0)
+ #endif
+ 
+ #endif
+diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/Kconfig linux-4.14.30/arch/arm/mach-versatile/Kconfig
+--- linux-4.14.30.orig/arch/arm/mach-versatile/Kconfig	2018-03-24 11:01:30.000000000 +0100
++++ linux-4.14.30/arch/arm/mach-versatile/Kconfig	2018-04-01 04:14:15.992043275 +0100
+@@ -1,7 +1,8 @@
+ # SPDX-License-Identifier: GPL-2.0
+ config ARCH_VERSATILE
+-	bool "ARM Ltd. Versatile family"
+-	depends on ARCH_MULTI_V5
++	bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5
++	depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE
++	default y if ARM_SINGLE_ARCH_VERSATILE
+ 	select ARM_AMBA
+ 	select ARM_TIMER_SP804
+ 	select ARM_VIC
+diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/Makefile.boot linux-4.14.30/arch/arm/mach-versatile/Makefile.boot
+--- linux-4.14.30.orig/arch/arm/mach-versatile/Makefile.boot	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14.30/arch/arm/mach-versatile/Makefile.boot	2018-04-01 04:14:15.992043275 +0100
+@@ -0,0 +1,3 @@
++# Empty file waiting for deletion once Makefile.boot isn't needed any more.
++# Patch waits for application at
++# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
+diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c
+--- linux-4.14.30.orig/arch/arm/mach-versatile/versatile_dt.c	2018-03-24 11:01:30.000000000 +0100
++++ linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c	2018-04-01 04:14:15.992043275 +0100
+@@ -37,7 +37,11 @@
+ #include <asm/mach/map.h>
+ 
+ /* macro to get at MMIO space when running virtually */
++#ifdef CONFIG_MMU
+ #define IO_ADDRESS(x)		(((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
++#else
++#define IO_ADDRESS(x)		(x)
++#endif
+ #define __io_address(n)		((void __iomem __force *)IO_ADDRESS(n))
+ 
+ /*
diff --git a/target/linux/patches/4.14.32/h8300.patch b/target/linux/patches/4.14.32/h8300.patch
new file mode 100644
index 000000000..836a414e5
--- /dev/null
+++ b/target/linux/patches/4.14.32/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.32/initramfs-nosizelimit.patch b/target/linux/patches/4.14.32/initramfs-nosizelimit.patch
new file mode 100644
index 000000000..0e524c1d9
--- /dev/null
+++ b/target/linux/patches/4.14.32/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.32/or1k-more-ram.patch b/target/linux/patches/4.14.32/or1k-more-ram.patch
new file mode 100644
index 000000000..de848c838
--- /dev/null
+++ b/target/linux/patches/4.14.32/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.32/startup.patch b/target/linux/patches/4.14.32/startup.patch
new file mode 100644
index 000000000..bac354728
--- /dev/null
+++ b/target/linux/patches/4.14.32/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;