diff --git a/arch/arm64/boot/dts/rockchip/uEnv/boot.cmd b/arch/arm64/boot/dts/rockchip/uEnv/boot.cmd new file mode 100644 index 000000000000..7272edacff83 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/uEnv/boot.cmd @@ -0,0 +1,37 @@ +echo [boot.cmd] run boot.cmd scripts ...; + +if test -e ${devtype} ${devnum}:${distro_bootpart} /uEnv/uEnv.txt; then + + echo [boot.cmd] load ${devtype} ${devnum}:${distro_bootpart} ${env_addr_r} /uEnv/uEnv.txt ...; + load ${devtype} ${devnum}:${distro_bootpart} ${env_addr_r} /uEnv/uEnv.txt; + + echo [boot.cmd] Importing environment from ${devtype} ... + env import -t ${env_addr_r} 0x8000 + + setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p3 ${cmdline} + printenv bootargs + + echo [boot.cmd] load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} /initrd-${uname_r} ... + load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} /initrd-${uname_r} + + echo [boot.cmd] loading ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} /Image-${uname_r} ... + load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} /Image-${uname_r} + + echo [boot.cmd] loading default rk-kernel.dtb + load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} /rk-kernel.dtb + + fdt addr ${fdt_addr_r} + fdt set /chosen bootargs + + echo [boot.cmd] dtoverlay from /uEnv/uEnv.txt + dtfile ${fdt_addr_r} ${fdt_over_addr} /uEnv/uEnv.txt ${env_addr_r} + + echo [boot.cmd] [${devtype} ${devnum}:${distro_bootpart}] ... + echo [boot.cmd] [booti] ... + booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r} +fi + +echo [boot.cmd] run boot.cmd scripts failed ...; + +# Recompile with: +# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr diff --git a/arch/arm64/boot/dts/rockchip/uEnv/uEnv.txt b/arch/arm64/boot/dts/rockchip/uEnv/uEnv.txt index 142a54aef96c..00cdc444c59c 100644 --- a/arch/arm64/boot/dts/rockchip/uEnv/uEnv.txt +++ b/arch/arm64/boot/dts/rockchip/uEnv/uEnv.txt @@ -1,6 +1,6 @@ uname_r=4.19.232 size=0x1000000 -bootargs=console=ttyFIQ0 +cmdline="earlyprintk console=ttyFIQ0 consoleblank=0 loglevel=7 rootwait rw rootfstype=ext4" enable_uboot_overlays=1 #overlay_start diff --git a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat1.txt b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat1.txt index 0c1276ebeede..9c956f57a3ba 100644 --- a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat1.txt +++ b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat1.txt @@ -1,7 +1,6 @@ uname_r=4.19.232 size=0x1000000 -bootargs=console=ttyFIQ0 console=tty1 -#dtb=rk3566-lubancat1.dtb +cmdline="earlyprintk console=ttyFIQ0 console=tty1 consoleblank=0 loglevel=7 rootwait rw rootfstype=ext4" enable_uboot_overlays=1 #overlay_start diff --git a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat1N.txt b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat1N.txt index 50e8f337e137..461d7579e6aa 100644 --- a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat1N.txt +++ b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat1N.txt @@ -1,7 +1,7 @@ uname_r=4.19.232 size=0x1000000 -bootargs=console=ttyFIQ0 console=tty1 -#dtb=rk3566-lubancat1-n.dtb +cmdline="earlyprintk console=ttyFIQ0 console=tty1 consoleblank=0 loglevel=7 rootwait rw rootfstype=ext4" + enable_uboot_overlays=1 #overlay_start diff --git a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2-V1.txt b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2-V1.txt index 3688dab5df0b..eee565e60ed0 100644 --- a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2-V1.txt +++ b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2-V1.txt @@ -1,7 +1,6 @@ uname_r=4.19.232 size=0x1000000 -bootargs=console=ttyFIQ0 console=tty1 -#dtb=rk3568-lubancat2.dtb +cmdline="earlyprintk console=ttyFIQ0 console=tty1 consoleblank=0 loglevel=7 rootwait rw rootfstype=ext4" enable_uboot_overlays=1 #overlay_start diff --git a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2.txt b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2.txt index 8200f82b14a9..ebcf1b8b60fb 100644 --- a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2.txt +++ b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2.txt @@ -1,7 +1,6 @@ uname_r=4.19.232 size=0x1000000 -bootargs=console=ttyFIQ0 console=tty1 -#dtb=rk3568-lubancat2.dtb +cmdline="earlyprintk console=ttyFIQ0 console=tty1 consoleblank=0 loglevel=7 rootwait rw rootfstype=ext4" enable_uboot_overlays=1 #overlay_start diff --git a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2IO.txt b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2IO.txt index 3be27f0c8a7a..15e0880b77d1 100644 --- a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2IO.txt +++ b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2IO.txt @@ -1,7 +1,6 @@ uname_r=4.19.232 size=0x1000000 -bootargs=console=ttyFIQ0 console=tty1 -#dtb=rk3568-lubancat2-io.dtb +cmdline="earlyprintk console=ttyFIQ0 console=tty1 consoleblank=0 loglevel=7 rootwait rw rootfstype=ext4" enable_uboot_overlays=1 #overlay_start diff --git a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2N.txt b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2N.txt index d98588e01e61..54e6d1a7820c 100644 --- a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2N.txt +++ b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCat2N.txt @@ -1,7 +1,6 @@ uname_r=4.19.232 size=0x1000000 -bootargs=console=ttyFIQ0 console=tty1 -#dtb=rk3568-lubancat2-n.dtb +cmdline="earlyprintk console=ttyFIQ0 console=tty1 consoleblank=0 loglevel=7 rootwait rw rootfstype=ext4" enable_uboot_overlays=1 #overlay_start diff --git a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCatZN.txt b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCatZN.txt index f62bd6e073e0..0a93a9c118c0 100644 --- a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCatZN.txt +++ b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCatZN.txt @@ -1,7 +1,6 @@ uname_r=4.19.232 size=0x1000000 -bootargs=console=ttyFIQ0 console=tty1 -#dtb=rk3566-lubancat-zero.dtb +cmdline="earlyprintk console=ttyFIQ0 console=tty1 consoleblank=0 loglevel=7 rootwait rw rootfstype=ext4" enable_uboot_overlays=1 #overlay_start diff --git a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCatZW.txt b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCatZW.txt index b08ea7ec5413..ce5109d7af86 100644 --- a/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCatZW.txt +++ b/arch/arm64/boot/dts/rockchip/uEnv/uEnvLubanCatZW.txt @@ -1,7 +1,6 @@ uname_r=4.19.232 size=0x1000000 -bootargs=console=ttyFIQ0 console=tty1 -#dtb=rk3566-lubancat-zero.dtb +cmdline="earlyprintk console=ttyFIQ0 console=tty1 consoleblank=0 loglevel=7 rootwait rw rootfstype=ext4" enable_uboot_overlays=1 #overlay_start