From 1ca081000a6acf36a7e6c42362d8fa5767413203 Mon Sep 17 00:00:00 2001 From: Sander Vanheule Date: Sun, 20 Feb 2022 16:25:40 +0100 Subject: [PATCH] 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 --- target/linux/realtek/dts-5.10/rtl8393_zyxel_gs1900-48.dts | 4 ---- target/linux/realtek/dts-5.10/rtl839x.dtsi | 2 +- target/linux/realtek/dts-5.10/rtl9302_zyxel_xgs1250-12.dts | 4 ---- target/linux/realtek/dts-5.10/rtl930x.dtsi | 2 +- target/linux/realtek/dts-5.10/rtl931x.dtsi | 2 +- 5 files changed, 3 insertions(+), 11 deletions(-) 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 f72b654b570..9deecd636e3 100644 --- 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 19da1c11cbe..3325dd9969c 100644 --- 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 28cace6c108..d8164fd5c22 100644 --- 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 ebacdde68f2..12407a30731 100644 --- 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 8dd4cfdc928..29aee1f7b26 100644 --- 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 { -- 2.30.2