U-Boot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Stanislav Pinchuk <Stanislav.Pinchuk@kaspersky.com>
To: u-boot@lists.denx.de
Subject: [PATCH] vexpress_aemv8a: allow overriding BOOTCOMMAND
Date: Wed, 20 Jan 2021 21:54:53 +0300	[thread overview]
Message-ID: <df47c751-ad95-3200-0cf7-034076e6c1ea@kaspersky.com> (raw)

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

             reply	other threads:[~2021-01-20 18:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-20 18:54 Stanislav Pinchuk [this message]
2021-01-30 19:21 ` [PATCH] vexpress_aemv8a: allow overriding BOOTCOMMAND Tom Rini
  -- strict thread matches above, loose matches on Subject: below --
2021-01-20 17:00 Stanislav Pinchuk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=df47c751-ad95-3200-0cf7-034076e6c1ea@kaspersky.com \
    --to=stanislav.pinchuk@kaspersky.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox