leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vexpress_aemv8a: allow overriding BOOTCOMMAND

Browse Source 
Re-send because of line-wraps.

This patch fixes the behaviour of the menuconfig's BOOTCOMMAND
setting. Which is just ignored without that patch on
vexpress_aemv8a platform.

Signed-off-by: Stanislav.Pinchuk@kaspersky.com
This commit is contained in:
Stanislav Pinchuk
2021-01-20 21:54:53 +03:00
committed by Tom Rini
parent 3f1250a9e2
commit ef7db7a3e8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/configs/vexpress_aemv8a.h
View File

@@ -137,6 +137,7 @@
"fdt_alt_name=juno\0" \ "fdt_alt_name=juno\0" \
"fdt_addr_r=0x80000000\0" \ "fdt_addr_r=0x80000000\0" \
#ifndef CONFIG_BOOTCOMMAND
/* Copy the kernel and FDT to DRAM memory and boot */ /* Copy the kernel and FDT to DRAM memory and boot */
#define CONFIG_BOOTCOMMAND "afs load ${kernel_name} ${kernel_addr_r} ;"\ #define CONFIG_BOOTCOMMAND "afs load ${kernel_name} ${kernel_addr_r} ;"\
"if test $? -eq 1; then "\ "if test $? -eq 1; then "\
@@ -157,6 +158,7 @@
" else setenv ramdisk_param -; "\ " else setenv ramdisk_param -; "\
"fi ; " \ "fi ; " \
"booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}" "booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}"
#endif
#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
@@ -170,6 +172,7 @@
"boot_name=boot.img\0" \ "boot_name=boot.img\0" \
"boot_addr=0x8007f800\0" "boot_addr=0x8007f800\0"
#ifndef CONFIG_BOOTCOMMAND
#define CONFIG_BOOTCOMMAND "if smhload ${boot_name} ${boot_addr}; then " \ #define CONFIG_BOOTCOMMAND "if smhload ${boot_name} ${boot_addr}; then " \
" set bootargs; " \ " set bootargs; " \
" abootimg addr ${boot_addr}; " \ " abootimg addr ${boot_addr}; " \
@@ -187,8 +190,7 @@
" fdt chosen ${initrd_addr} ${initrd_end}; " \ " fdt chosen ${initrd_addr} ${initrd_end}; " \
" booti $kernel_addr - $fdt_addr; " \ " booti $kernel_addr - $fdt_addr; " \
"fi" "fi"
#endif
#endif #endif
/* Monitor Command Prompt */ /* Monitor Command Prompt */