aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorSander Vanheule <sander@svanheule.net>2022-02-20 16:25:40 +0100
committerDaniel Golle <daniel@makrotopia.org>2022-02-20 16:23:55 +0000
commit1ca081000a6acf36a7e6c42362d8fa5767413203 (patch)
tree62d80b09fc39d5181a3c67e92c4d6702d904f62d /target/linux
parent6f88526fa4e0aa5f60834d181d04f8a9911887be (diff)
downloadupstream-1ca081000a6acf36a7e6c42362d8fa5767413203.tar.gz
upstream-1ca081000a6acf36a7e6c42362d8fa5767413203.tar.bz2
upstream-1ca081000a6acf36a7e6c42362d8fa5767413203.zip
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>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/realtek/dts-5.10/rtl8393_zyxel_gs1900-48.dts4
-rw-r--r--target/linux/realtek/dts-5.10/rtl839x.dtsi2
-rw-r--r--target/linux/realtek/dts-5.10/rtl9302_zyxel_xgs1250-12.dts4
-rw-r--r--target/linux/realtek/dts-5.10/rtl930x.dtsi2
-rw-r--r--target/linux/realtek/dts-5.10/rtl931x.dtsi2
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 f72b654b57..9deecd636e 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 19da1c11cb..3325dd9969 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 28cace6c10..d8164fd5c2 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 ebacdde68f..12407a3073 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 8dd4cfdc92..29aee1f7b2 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 {