summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-03-23 11:06:12 +0100
committerTom Rini <trini@konsulko.com>2015-03-28 12:07:45 -0400
commit49995ffe81c266304bf9612fa2964b94d44a6c1c (patch)
tree70bb9425128fb8306ca534933161243e6a80a4a1 /include/configs
parent202a674bb8b7d7867503224857a2b0e04617d9b3 (diff)
downloadu-boot-imx-49995ffe81c266304bf9612fa2964b94d44a6c1c.zip
u-boot-imx-49995ffe81c266304bf9612fa2964b94d44a6c1c.tar.gz
u-boot-imx-49995ffe81c266304bf9612fa2964b94d44a6c1c.tar.bz2
vexpress64: remove board late init, use smhload
This removes the kludgy late board init from the FVP simulator version of Versatile Express 64bit (ARMv8), and replace it with a default boot command using the new smhload command to load the files using semihosting. Tested on the Foundation Model. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/vexpress_aemv8a.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 810eef1..5792461 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -15,7 +15,6 @@
#ifndef CONFIG_SEMIHOSTING
#error CONFIG_TARGET_VEXPRESS64_BASE_FVP requires CONFIG_SEMIHOSTING
#endif
-#define CONFIG_BOARD_LATE_INIT
#define CONFIG_ARMV8_SWITCH_TO_EL1
#endif
@@ -200,12 +199,12 @@
/* Initial environment variables */
#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
#define CONFIG_EXTRA_ENV_SETTINGS \
- "kernel_name=uImage\0" \
- "kernel_addr_r=0x80000000\0" \
+ "kernel_name=uImage\0" \
+ "kernel_addr=0x80000000\0" \
"initrd_name=ramdisk.img\0" \
- "initrd_addr_r=0x88000000\0" \
- "fdt_name=devtree.dtb\0" \
- "fdt_addr_r=0x83000000\0" \
+ "initrd_addr=0x88000000\0" \
+ "fdt_name=devtree.dtb\0" \
+ "fdt_addr=0x83000000\0" \
"fdt_high=0xffffffffffffffff\0" \
"initrd_high=0xffffffffffffffff\0"
@@ -213,9 +212,12 @@
"0x1c090000 debug user_debug=31 "\
"loglevel=9"
-#define CONFIG_BOOTCOMMAND "fdt addr $fdt_addr_r; fdt resize; " \
- "fdt chosen $initrd_addr_r $initrd_end; " \
- "bootm $kernel_addr_r - $fdt_addr_r"
+#define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \
+ "smhload ${fdt_name} $fdt_addr; " \
+ "smhload ${initrd_name} $initrd_addr initrd_end; " \
+ "fdt addr $fdt_addr; fdt resize; " \
+ "fdt chosen $initrd_addr $initrd_end; " \
+ "bootm $kernel_addr - $fdt_addr"
#define CONFIG_BOOTDELAY 1