diff options
| author | Tianling Shen | 2026-01-20 02:12:12 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-01-21 22:56:42 +0000 |
| commit | 609deedd87ed66718653a799a68fa3b52da844f7 (patch) | |
| tree | 58fc24b892d6a5c5b884e6e5f13c5c543faabce9 | |
| parent | a82738d83f3f1ec08b0d8f2d1fa5415f6f468d4c (diff) | |
| download | openwrt-609deedd87ed66718653a799a68fa3b52da844f7.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>
| -rw-r--r-- | target/linux/rockchip/image/default.bootscript | 28 |
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"; |