Commit 90f262a6951f ("vexpress64: Clean up BASE_FVP boot configuration")
cleaned up the usage of default address variables, but missed to update
the address for the kernel in the FVP's bootcmd definition.
Change ${kernel_addr} to read ${kernel_addr_r} to bring back the
automated boot for the fastmodel.
Also use "setenv" instead of the potentially ambiguous "set" on the way.
Fixes: 90f262a6951f ("vexpress64: Clean up BASE_FVP boot configuration")
Signed-off-by: Andre Przywara <[email protected]>
---
configs/vexpress_aemv8a_semi_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/vexpress_aemv8a_semi_defconfig
b/configs/vexpress_aemv8a_semi_defconfig
index 82a5b52f1e..448d012e1c 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -17,7 +17,7 @@ CONFIG_ANDROID_BOOT_IMAGE=y
CONFIG_BOOTDELAY=1
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31
loglevel=9"
-CONFIG_BOOTCOMMAND="if smhload ${boot_name} ${boot_addr_r}; then set
bootargs; abootimg addr ${boot_addr_r}; abootimg get dtb --index=0
fdt_addr_r; bootm ${boot_addr_r} ${boot_addr_r} ${fdt_addr_r}; else; set
fdt_high 0xffffffffffffffff; set initrd_high 0xffffffffffffffff; smhload
${kernel_name} ${kernel_addr}; smhload ${fdtfile} ${fdt_addr_r}; smhload
${ramdisk_name} ${ramdisk_addr_r} ramdisk_end; fdt addr ${fdt_addr_r}; fdt
resize; fdt chosen ${ramdisk_addr_r} ${ramdisk_end}; booti $kernel_addr -
$fdt_addr_r; fi"
+CONFIG_BOOTCOMMAND="if smhload ${boot_name} ${boot_addr_r}; then setenv
bootargs; abootimg addr ${boot_addr_r}; abootimg get dtb --index=0
fdt_addr_r; bootm ${boot_addr_r} ${boot_addr_r} ${fdt_addr_r}; else;
setenv fdt_high 0xffffffffffffffff; setenv initrd_high 0xffffffffffffffff;
smhload ${kernel_name} ${kernel_addr_r}; smhload ${fdtfile} ${fdt_addr_r};
smhload ${ramdisk_name} ${ramdisk_addr_r} ramdisk_end; fdt addr
${fdt_addr_r}; fdt resize; fdt chosen ${ramdisk_addr_r} ${ramdisk_end};
booti $kernel_addr_r - $fdt_addr_r; fi"
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="VExpress64# "
--
2.25.1
