realtek: consolidate bootargs again

Bootargs for devices in the realtek target were previously consolidated
in commit af2cfbda2bf5 ("realtek: Consolidate bootargs"), since all
devices currently use the same arguments.

Commit a75b9e3ecb61 ("realtek: Adding RTL930X sub-target") reverted this
without any argumentation, so let's undo that.

Commit 0b8dfe085180 ("realtek: Add RTL931X sub-target") introduced the
old bootargs also for RTL931x, without providing any actual device
support. Until that is done, let's assume vendors will have done what
they did before, and use a baud rate of 115200.

Fixes: a75b9e3ecb61 ("realtek: Adding RTL930X sub-target")
Signed-off-by: Sander Vanheule <sander@svanheule.net>

diff --git a/target/linux/realtek/dts-5.10/rtl8393_zyxel_gs1900-48.dts b/target/linux/realtek/dts-5.10/rtl8393_zyxel_gs1900-48.dts
index f72b654b570e9c64a5ea257a50c92c4cf15897aa..9deecd636e314694f08e149baebc893b440c80d9 100644 (file)
--- a/target/linux/realtek/dts-5.10/rtl8393_zyxel_gs1900-48.dts
+++ b/target/linux/realtek/dts-5.10/rtl8393_zyxel_gs1900-48.dts
@@ -21,10 +21,6 @@
                reg = <0x0 0x8000000>;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        leds {
                pinctrl-names = "default";
                pinctrl-0 = <&pinmux_disable_sys_led>;

diff --git a/target/linux/realtek/dts-5.10/rtl839x.dtsi b/target/linux/realtek/dts-5.10/rtl839x.dtsi
index 19da1c11cbeda55d02eca725a43dfbbec28beb80..3325dd9969cd454e5bce92cf70851e04763c43b4 100644 (file)
--- a/target/linux/realtek/dts-5.10/rtl839x.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl839x.dtsi
@@ -65,7 +65,7 @@
        };
 
        chosen {
-               bootargs = "console=ttyS0,38400";
+               bootargs = "console=ttyS0,115200";
        };
 
        lx_clk: lx_clk {

diff --git a/target/linux/realtek/dts-5.10/rtl9302_zyxel_xgs1250-12.dts b/target/linux/realtek/dts-5.10/rtl9302_zyxel_xgs1250-12.dts
index 28cace6c108b9907e41e91a2309230fd1c432089..d8164fd5c22dfc5cc656744b34e05ab073e42f23 100644 (file)
--- a/target/linux/realtek/dts-5.10/rtl9302_zyxel_xgs1250-12.dts
+++ b/target/linux/realtek/dts-5.10/rtl9302_zyxel_xgs1250-12.dts
@@ -10,10 +10,6 @@
        compatible = "zyxel,xgs1250-12", "realtek,rtl838x-soc";
        model = "Zyxel XGS1250-12 Switch";
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/realtek/dts-5.10/rtl930x.dtsi b/target/linux/realtek/dts-5.10/rtl930x.dtsi
index ebacdde68f25b33a4c88a8faab16028755a71c7b..12407a3073139fb5f61b90c0e88ba1dcb77a2338 100644 (file)
--- a/target/linux/realtek/dts-5.10/rtl930x.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl930x.dtsi
@@ -25,7 +25,7 @@
        };
 
        chosen {
-               bootargs = "console=ttyS0,38400";
+               bootargs = "console=ttyS0,115200";
        };
 
        cpuintc: cpuintc {

diff --git a/target/linux/realtek/dts-5.10/rtl931x.dtsi b/target/linux/realtek/dts-5.10/rtl931x.dtsi
index 8dd4cfdc928ce677e1fdc8ed4aaeec0e5e2e1068..29aee1f7b268f156eab3a38ffa8b1fa7a77f8679 100644 (file)
--- a/target/linux/realtek/dts-5.10/rtl931x.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl931x.dtsi
@@ -30,7 +30,7 @@
        };
        
        chosen {
-               bootargs = "console=ttyS0,38400";
+               bootargs = "console=ttyS0,115200";
        };
 
        lx_clk: lx_clk {