* [PATCH] vexpress_aemv8a: allow overriding BOOTCOMMAND
@ 2021-01-20 18:54 Stanislav Pinchuk
2021-01-30 19:21 ` Tom Rini
0 siblings, 1 reply; 3+ messages in thread
From: Stanislav Pinchuk @ 2021-01-20 18:54 UTC (permalink / raw)
To: u-boot
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 at 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..2f574fc119 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,7 +158,7 @@
" else setenv ramdisk_param -; "\
"fi ; " \
"booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}"
-
+#endif
#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -170,6 +171,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,7 +189,7 @@
" fdt chosen ${initrd_addr} ${initrd_end}; " \
" booti $kernel_addr - $fdt_addr; " \
"fi"
-
+#endif
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] vexpress_aemv8a: allow overriding BOOTCOMMAND
2021-01-20 18:54 [PATCH] vexpress_aemv8a: allow overriding BOOTCOMMAND Stanislav Pinchuk
@ 2021-01-30 19:21 ` Tom Rini
0 siblings, 0 replies; 3+ messages in thread
From: Tom Rini @ 2021-01-30 19:21 UTC (permalink / raw)
To: u-boot
On Wed, Jan 20, 2021 at 09:54:53PM +0300, Stanislav Pinchuk wrote:
> 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 at kaspersky.com
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210130/48cff77f/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] vexpress_aemv8a: allow overriding BOOTCOMMAND
@ 2021-01-20 17:00 Stanislav Pinchuk
0 siblings, 0 replies; 3+ messages in thread
From: Stanislav Pinchuk @ 2021-01-20 17:00 UTC (permalink / raw)
To: u-boot
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 at 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..2f574fc119 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,7 +158,7 @@
" else setenv ramdisk_param -; "\
"fi ; " \
"booti ${kernel_addr_r} ${ramdisk_param} ${fdt_a
ddr_r}"
-
+#endif
#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -170,6 +171,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,7 +189,7 @@
" fdt chosen ${initrd_addr} ${initrd_end}; " \
" booti $kernel_addr - $fdt_addr; " \
"fi"
-
+#endif
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-30 19:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-20 18:54 [PATCH] vexpress_aemv8a: allow overriding BOOTCOMMAND Stanislav Pinchuk
2021-01-30 19:21 ` Tom Rini
-- strict thread matches above, loose matches on Subject: below --
2021-01-20 17:00 Stanislav Pinchuk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.