Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-28 08:35:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fvp: Add support for loading Android boot images via semihosting

Browse source 
FVP now loads an Android boot image named boot.img if available,
otherwise it falls back to the existing code path.

Signed-off-by: Peter Collingbourne <pcc@google.com>
Reviewed-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Peter Collingbourne 2020-04-03 19:58:24 -07:00 • committed by Tom Rini
parent ebfe611be9
commit ec8eef5e71
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs/vexpress_aemv8a_semi_defconfig
View file

@ -14,6 +14,8 @@ CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 l
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="VExpress64# " CONFIG_SYS_PROMPT="VExpress64# "
CONFIG_ANDROID_BOOT_IMAGE=y
CONFIG_CMD_ABOOTIMG=y
# CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_CONSOLE is not set
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set
# CONFIG_CMD_EDITENV is not set # CONFIG_CMD_EDITENV is not set

28
include/configs/vexpress_aemv8a.h
View file

@ -177,16 +177,26 @@
"initrd_addr=0x88000000\0" \ "initrd_addr=0x88000000\0" \
"fdtfile=devtree.dtb\0" \ "fdtfile=devtree.dtb\0" \
"fdt_addr=0x83000000\0" \ "fdt_addr=0x83000000\0" \
"fdt_high=0xffffffffffffffff\0" \ "boot_name=boot.img\0" \
"initrd_high=0xffffffffffffffff\0" "boot_addr=0x8007f800\0"
#define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \ #define CONFIG_BOOTCOMMAND "if smhload ${boot_name} ${boot_addr}; then " \
"smhload ${fdtfile} ${fdt_addr}; " \ " set bootargs; " \
"smhload ${initrd_name} ${initrd_addr} "\ " abootimg addr ${boot_addr}; " \
"initrd_end; " \ " abootimg get dtb --index=0 fdt_addr; " \
"fdt addr ${fdt_addr}; fdt resize; " \ " bootm ${boot_addr} ${boot_addr} " \
"fdt chosen ${initrd_addr} ${initrd_end}; " \ " ${fdt_addr}; " \
"booti $kernel_addr - $fdt_addr" "else; " \
" set fdt_high 0xffffffffffffffff; " \
" set initrd_high 0xffffffffffffffff; " \
" smhload ${kernel_name} ${kernel_addr}; " \
" smhload ${fdtfile} ${fdt_addr}; " \
" smhload ${initrd_name} ${initrd_addr} "\
" initrd_end; " \
" fdt addr ${fdt_addr}; fdt resize; " \
" fdt chosen ${initrd_addr} ${initrd_end}; " \
" booti $kernel_addr - $fdt_addr; " \
"fi"
#endif #endif