summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianling Shen2026-01-20 02:12:12 +0000
committerDaniel Golle2026-01-23 16:07:17 +0000
commit4303066fb8650999b1685a94644af0a8ff992276 (patch)
tree91f38f42f06a3d2e0b6f29cc72fa10a8bc3ee070
parentf618048052f53e10367d7a65782990987b8454ab (diff)
downloadopenwrt-4303066fb8650999b1685a94644af0a8ff992276.tar.gz
rockchip: fix set default serial_{addr,port} in boot script
On some SoCs like RK3399, U-Boot no longer export the serial address in $stdout variable, it has been changed to something like `stdout=serial,vidconsole` since video supported was added. So detect $soc variable instead, this also makes the script more clear. Addtional note: rk3566 is reported as rk3568, rk3582 is reported as rk3588 in $soc. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org> Link: https://github.com/openwrt/openwrt/pull/21610 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 609deedd87ed66718653a799a68fa3b52da844f7)
-rw-r--r--target/linux/rockchip/image/default.bootscript28
1 files changed, 15 insertions, 13 deletions
diff --git a/target/linux/rockchip/image/default.bootscript b/target/linux/rockchip/image/default.bootscript
index 98dd32356b..77d22754b8 100644
--- a/target/linux/rockchip/image/default.bootscript
+++ b/target/linux/rockchip/image/default.bootscript
@@ -1,18 +1,20 @@
part uuid ${devtype} ${devnum}:2 uuid
-if test $stdout = 'serial@2ad40000' ;
-then serial_addr=',0x2ad40000'; serial_port='ttyS0';
-elif test $stdout = 'serial@fe660000' ;
-then serial_addr=',0xfe660000'; serial_port='ttyS2';
-elif test $stdout = 'serial@feb50000' ;
-then serial_addr=',0xfeb50000'; serial_port='ttyS2';
-elif test $stdout = 'serial@ff130000' ;
-then serial_addr=',0xff130000'; serial_port='ttyS2';
-elif test $stdout = 'serial@ff1a0000' ;
-then serial_addr=',0xff1a0000'; serial_port='ttyS2';
-elif test $stdout = 'serial@ff9f0000' ;
-then serial_addr=',0xff9f0000'; serial_port='ttyS0';
-fi;
+if test $soc = 'rk3308'; then
+ serial_addr=',0xff0c0000'; serial_port='ttyS2';
+elif test $soc = 'rk3328'; then
+ serial_addr=',0xff130000'; serial_port='ttyS2';
+elif test $soc = 'rk3399'; then
+ serial_addr=',0xff1a0000'; serial_port='ttyS2';
+elif test $soc = 'rk3528'; then
+ serial_addr=',0xff9f0000'; serial_port='ttyS0';
+elif test $soc = 'rk3568'; then
+ serial_addr=',0xfe660000'; serial_port='ttyS2';
+elif test $soc = 'rk3576'; then
+ serial_addr=',0x2ad40000'; serial_port='ttyS0';
+elif test $soc = 'rk3588'; then
+ serial_addr=',0xfeb50000'; serial_port='ttyS2';
+fi
setenv bootargs "console=${serial_port},1500000 earlycon=uart8250,mmio32${serial_addr} root=PARTUUID=${uuid} rw rootwait";