qualcommax: ipq50xx: move bootargs to Linksys board files

Move setting kernel bootargs from the base template down to the
respective Linksys board files. This allows for having devices which
require different bootargs use the base template device tree file.

Signed-off-by: George Moussalem <george.moussalem@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/21038
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
index 07fc612b2a9fb3743a6de46887d38ec3b309ce74..8ff30ec436cd010f4902b57924c7e3ec017aa48a 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
@@ -7,6 +7,11 @@
        model = "Linksys MR5500";
        compatible = "linksys,mr5500", "qcom,ipq5018";
 
+       chosen {
+               bootargs-append = " root=/dev/ubiblock0_0 coherent_pool=2M";
+               stdout-path = "serial0:115200n8";
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx-base.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx-base.dtsi
index 76c038461792c98e56da3f1ecd3c4194c879e32a..629f523c5d2ca0ab3188eed91fa5c599a01f1195 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx-base.dtsi
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx-base.dtsi
@@ -15,11 +15,6 @@
                serial0 = &blsp1_uart1;
        };
 
-       chosen {
-               bootargs-append = " root=/dev/ubiblock0_0 coherent_pool=2M";
-               stdout-path = "serial0:115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts
index f6b58d2cbc0dde61cda73e630c94ca4996163266..428912332ce9b165473d44ab3ceaf05a88e230f7 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts
@@ -7,6 +7,11 @@
 / {
        model = "Linksys MX2000";
        compatible = "linksys,mx2000", "qcom,ipq5018";
+
+       chosen {
+               bootargs-append = " root=/dev/ubiblock0_0 coherent_pool=2M";
+               stdout-path = "serial0:115200n8";
+       };
 };
 
 /*

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
index 2dc77594c1827a367cebd5727cbb805072218aaf..0ea27d3373a586609404e44d98c17386c9569cd5 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
@@ -6,6 +6,11 @@
 / {
        model = "Linksys MX5500";
        compatible = "linksys,mx5500", "qcom,ipq5018";
+
+       chosen {
+               bootargs-append = " root=/dev/ubiblock0_0 coherent_pool=2M";
+               stdout-path = "serial0:115200n8";
+       };
 };
 
 /*

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
index 423a3f05350f3f049ae60d6d7c8728ed10ed037b..90a87299a6aa0e0de3df51edd3a5f34ff7307e02 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
@@ -6,6 +6,11 @@
 / {
        model = "Linksys SPNMX56";
        compatible = "linksys,spnmx56", "qcom,ipq5018";
+
+       chosen {
+               bootargs-append = " root=/dev/ubiblock0_0 coherent_pool=2M";
+               stdout-path = "serial0:115200n8";
+       };
 };
 
 /*