Browse Source

vexpress_aemv8a: allow overriding BOOTCOMMAND

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
Stanislav Pinchuk 3 years ago
parent
commit
ef7db7a3e8
1 changed files with 4 additions and 2 deletions
  1. 4 2
      include/configs/vexpress_aemv8a.h

+ 4 - 2
include/configs/vexpress_aemv8a.h

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