diff --git a/config/bootscripts/boot-rk3328.cmd b/config/bootscripts/boot-rk3328.cmd index 2332d01759..86efb29a3b 100644 --- a/config/bootscripts/boot-rk3328.cmd +++ b/config/bootscripts/boot-rk3328.cmd @@ -12,10 +12,10 @@ setenv console "both" setenv rootfstype "ext4" setenv docker_optimizations "on" -echo "Boot script loaded from ${devtype}" +echo "Boot script loaded from ${devtype} ${devnum}" -if test -e ${devtype} 0 ${prefix}armbianEnv.txt; then - load ${devtype} 0 ${load_addr} ${prefix}armbianEnv.txt +if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then + load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt env import -t ${load_addr} ${filesize} fi @@ -28,34 +28,34 @@ setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory swapaccount=1"; fi -load ${devtype} 0 ${ramdisk_addr_r} ${prefix}uInitrd -load ${devtype} 0 ${kernel_addr_r} ${prefix}Image +load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd +load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image -load ${devtype} 0 ${fdt_addr_r} ${prefix}dtb/${fdtfile} +load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile} fdt addr ${fdt_addr_r} fdt resize 65536 for overlay_file in ${overlays}; do - if load ${devtype} 0 ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then + if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo" fdt apply ${load_addr} || setenv overlay_error "true" fi done for overlay_file in ${user_overlays}; do - if load ${devtype} 0 ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then + if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then echo "Applying user provided DT overlay ${overlay_file}.dtbo" fdt apply ${load_addr} || setenv overlay_error "true" fi done if test "${overlay_error}" = "true"; then echo "Error applying DT overlays, restoring original DT" - load ${devtype} 0 ${fdt_addr_r} ${prefix}dtb/rockchip/${fdtfile} + load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/rockchip/${fdtfile} else - if load ${devtype} 0 ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then + if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)" source ${load_addr} fi - if test -e ${devtype} 0 ${prefix}fixup.scr; then - load ${devtype} 0 ${load_addr} ${prefix}fixup.scr + if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then + load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr echo "Applying user provided fixup script (fixup.scr)" source ${load_addr} fi diff --git a/config/sources/rk3328.conf b/config/sources/rk3328.conf index 8ee7527d8f..7355616e04 100644 --- a/config/sources/rk3328.conf +++ b/config/sources/rk3328.conf @@ -10,6 +10,7 @@ UBOOT_USE_GCC='> 6.0' HAS_UUID_SUPPORT=yes BOOTDELAY=0 +OVERLAY_PREFIX='rk3328' ATFSOURCE='https://github.com/rockchip-linux/arm-trusted-firmware' ATFDIR='arm-trusted-firmware-rk3328'