linux: update 4.14/4.15

11 files changed, 40 insertions, 6 deletions

diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index 9c2bdcefc..3a82531d1 100644
--- a/mk/linux-ver.mk
+++ b/mk/linux-ver.mk
@@ -16,16 +16,16 @@ KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_15),y)
-KERNEL_FILE_VER:=	4.15.13
+KERNEL_FILE_VER:=	4.15.15
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		1d2ee95a4f08ed0404ece84cc37b5764c3fcef000c18f828d81f3e039b1255c5
+KERNEL_HASH:=		0b56e8ef7e6fee6a995bfe0eeb3631c2e145cc2ca205861dd301f4c0d803dadf
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y)
-KERNEL_FILE_VER:=	4.14.30
+KERNEL_FILE_VER:=	4.14.32
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		7c5bb02feb48f1b7ab9a9c3ff051f325c0c6474fb0e25d9d7bcee91b2cfe6645
+KERNEL_HASH:=		cb0979bec663089a43b10cfbeae0cf9673544b0ff5968c33ede614ec0f43b680
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_9),y)
 KERNEL_FILE_VER:=	4.9.92
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index ad284a504..f6be47225 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -30,7 +30,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_4_15
-	bool "4.15.13"
+	bool "4.15.15"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_CSKY
@@ -38,7 +38,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_15
 	depends on !ADK_TARGET_ARCH_NDS32
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_4_14
-	bool "4.14.30"
+	bool "4.14.32"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_CSKY
diff --git a/target/linux/patches/4.14.30/arm-nommu.patch b/target/linux/patches/4.14.32/arm-nommu.patch
index b91aaf712..b91aaf712 100644
--- a/target/linux/patches/4.14.30/arm-nommu.patch
+++ b/target/linux/patches/4.14.32/arm-nommu.patch
diff --git a/target/linux/patches/4.14.30/h8300.patch b/target/linux/patches/4.14.32/h8300.patch
index 836a414e5..836a414e5 100644
--- a/target/linux/patches/4.14.30/h8300.patch
+++ b/target/linux/patches/4.14.32/h8300.patch
diff --git a/target/linux/patches/4.14.30/initramfs-nosizelimit.patch b/target/linux/patches/4.14.32/initramfs-nosizelimit.patch
index 0e524c1d9..0e524c1d9 100644
--- a/target/linux/patches/4.14.30/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.14.32/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.14.30/or1k-more-ram.patch b/target/linux/patches/4.14.32/or1k-more-ram.patch
index de848c838..de848c838 100644
--- a/target/linux/patches/4.14.30/or1k-more-ram.patch
+++ b/target/linux/patches/4.14.32/or1k-more-ram.patch
diff --git a/target/linux/patches/4.14.30/startup.patch b/target/linux/patches/4.14.32/startup.patch
index bac354728..bac354728 100644
--- a/target/linux/patches/4.14.30/startup.patch
+++ b/target/linux/patches/4.14.32/startup.patch
diff --git a/target/linux/patches/4.15.13/arm-nommu.patch b/target/linux/patches/4.15.15/arm-nommu.patch
index 2480b5169..2480b5169 100644
--- a/target/linux/patches/4.15.13/arm-nommu.patch
+++ b/target/linux/patches/4.15.15/arm-nommu.patch
diff --git a/target/linux/patches/4.15.13/h8300.patch b/target/linux/patches/4.15.15/h8300.patch
index 836a414e5..836a414e5 100644
--- a/target/linux/patches/4.15.13/h8300.patch
+++ b/target/linux/patches/4.15.15/h8300.patch
diff --git a/target/linux/patches/4.15.13/or1k-more-ram.patch b/target/linux/patches/4.15.15/or1k-more-ram.patch
index de848c838..de848c838 100644
--- a/target/linux/patches/4.15.13/or1k-more-ram.patch
+++ b/target/linux/patches/4.15.15/or1k-more-ram.patch
diff --git a/target/linux/patches/4.15.15/startup.patch b/target/linux/patches/4.15.15/startup.patch
new file mode 100644
index 000000000..8115b2cc6
--- /dev/null
+++ b/target/linux/patches/4.15.15/startup.patch
@@ -0,0 +1,34 @@
+diff -Nur linux-4.15.13.orig/init/initramfs.c linux-4.15.13/init/initramfs.c
+--- linux-4.15.13.orig/init/initramfs.c	2018-03-24 11:02:53.000000000 +0100
++++ linux-4.15.13/init/initramfs.c	2018-04-04 21:05:40.670682792 +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.15.13.orig/init/main.c linux-4.15.13/init/main.c
+--- linux-4.15.13.orig/init/main.c	2018-03-24 11:02:53.000000000 +0100
++++ linux-4.15.13/init/main.c	2018-04-04 21:05:40.671682779 +0100
+@@ -1075,6 +1075,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);
+ 	/*
+@@ -1083,7 +1085,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;