From ef7db7a3e893b64ba5e15a0fb04b06356fc87459 Mon Sep 17 00:00:00 2001
From: Stanislav Pinchuk <Stanislav.Pinchuk@kaspersky.com>
Date: Wed, 20 Jan 2021 21:54:53 +0300
Subject: [PATCH] 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
---
include/configs/vexpress_aemv8a.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index e63c335f85..566bee5b87 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/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 */
--
2.39.5