From: Paul Wassi
Date: Fri, 16 Mar 2018 08:29:40 +0000 (+0100)
Subject: kirkwood: fix initramfs boot warning on iconnect
X-Git-Tag: v18.06.0-rc1~583
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6fe9277d0c47777c27e162262e5337765e69d422;p=oweals%2Fopenwrt.git
kirkwood: fix initramfs boot warning on iconnect
The chosen dts configuration linux,initrd-* gives an error message
on bootup of kirkwood-iconnect. Since initramfs/initrd is not used
remove these options from the dts.
Reported-by: Daniel Engberg
Tested-by: Daniel Engberg
Signed-off-by: Paul Wassi
---
diff --git a/target/linux/kirkwood/patches-4.14/101-iconnect.patch b/target/linux/kirkwood/patches-4.14/101-iconnect.patch
index ba81e169de..ab47b5a724 100644
--- a/target/linux/kirkwood/patches-4.14/101-iconnect.patch
+++ b/target/linux/kirkwood/patches-4.14/101-iconnect.patch
@@ -1,6 +1,15 @@
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
-@@ -146,28 +146,23 @@
+@@ -16,8 +16,6 @@
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
+- linux,initrd-start = <0x4500040>;
+- linux,initrd-end = <0x4800000>;
+ };
+
+ ocp@f1000000 {
+@@ -146,28 +144,23 @@
status = "okay";
partition@0 {
diff --git a/target/linux/kirkwood/patches-4.9/101-iconnect.patch b/target/linux/kirkwood/patches-4.9/101-iconnect.patch
index 20fb0c8c57..17705eae19 100644
--- a/target/linux/kirkwood/patches-4.9/101-iconnect.patch
+++ b/target/linux/kirkwood/patches-4.9/101-iconnect.patch
@@ -1,6 +1,15 @@
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
-@@ -145,28 +145,23 @@
+@@ -15,8 +15,6 @@
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
+- linux,initrd-start = <0x4500040>;
+- linux,initrd-end = <0x4800000>;
+ };
+
+ ocp@f1000000 {
+@@ -145,28 +143,23 @@
status = "okay";
partition@0 {