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
Link: https://github.com/openwrt/openwrt/pull/21273
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 77be190dc4c42490f52c8a35195f716870ef0411..4c1f50938cb80bc18b6ffc73a6fa343360f61872 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 2883a466f366be305b0f8013af76ef60338c8005..73d232e05c6d735038270d18ec1d060fdd99eda9 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 6ee86d60293d16f05e33941faaae1847f59f4c48..1dafa63414cc24323647800472ed296afbe57a50 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";
+       };
 };
 
 /*