From 898b1668c05e786267ae0650ea72be4b6f61c5c9 Mon Sep 17 00:00:00 2001 From: George Moussalem Date: Tue, 9 Dec 2025 15:12:32 +0400 Subject: [PATCH] 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 Link: https://github.com/openwrt/openwrt/pull/21038 Link: https://github.com/openwrt/openwrt/pull/21273 Signed-off-by: Robert Marko --- .../files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts | 5 +++++ .../files/arch/arm64/boot/dts/qcom/ipq5018-mx-base.dtsi | 5 ----- .../files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts | 5 +++++ .../files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts | 5 +++++ .../files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts | 5 +++++ 5 files changed, 20 insertions(+), 5 deletions(-) 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 77be190dc4..4c1f50938c 100644 --- 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 76c0384617..629f523c5d 100644 --- 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 f6b58d2cbc..428912332c 100644 --- 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 2883a466f3..73d232e05c 100644 --- 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 6ee86d6029..1dafa63414 100644 --- 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"; + }; }; /*