From: Stefan Agner <stefan@agner.ch>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 1/3] spl: add RAM boot device only if it is actually defined
Date: Sat, 12 Nov 2016 11:13:06 -0800 [thread overview]
Message-ID: <20161112191308.22185-2-stefan@agner.ch> (raw)
In-Reply-To: <20161112191308.22185-1-stefan@agner.ch>
From: Stefan Agner <stefan.agner@toradex.com>
Some devices (e.g. dra7xx) support loading to RAM using DFU without
having direct boot from RAM support. Make sure the linker list
does not contain BOOT_DEVICE_RAM if CONFIG_SPL_RAM_SUPPORT is not
enabled.
Fixes: 98136b2f26fa ("spl: Convert spl_ram_load_image() to use linker list")
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
---
Changes in v2:
- Use CONFIG_SPL_RAM_SUPPORT to descide whether to compile the
function in first place.
common/spl/spl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/spl/spl.c b/common/spl/spl.c
index bdb165a..ef17619 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -174,7 +174,7 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
# define CONFIG_SPL_LOAD_FIT_ADDRESS 0
#endif
-#if defined(CONFIG_SPL_RAM_DEVICE) || defined(CONFIG_SPL_DFU_SUPPORT)
+#if defined(CONFIG_SPL_RAM_SUPPORT) || defined(CONFIG_SPL_DFU_SUPPORT)
static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
ulong count, void *buf)
{
@@ -220,7 +220,9 @@ static int spl_ram_load_image(struct spl_image_info *spl_image,
return 0;
}
+#if defined(CONFIG_SPL_RAM_SUPPORT)
SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_RAM, spl_ram_load_image);
+#endif
#if defined(CONFIG_SPL_DFU_SUPPORT)
SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_DFU, spl_ram_load_image);
#endif
--
2.10.2
next prev parent reply other threads:[~2016-11-12 19:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-12 19:13 [U-Boot] [PATCH v2 0/3] spl: USB Gadget cleanup Stefan Agner
2016-11-12 19:13 ` Stefan Agner [this message]
2016-11-14 20:44 ` [U-Boot] [PATCH v2 1/3] spl: add RAM boot device only if it is actually defined Simon Glass
2016-11-14 22:44 ` Stefan Agner
2016-11-15 0:33 ` Simon Glass
2016-11-12 19:13 ` [U-Boot] [PATCH v2 2/3] spl: dfu: move DFU Kconfig to SPL Kconfig Stefan Agner
2016-11-14 20:44 ` Simon Glass
2016-11-12 19:13 ` [U-Boot] [PATCH v2 3/3] spl: add USB Gadget config option Stefan Agner
2016-11-15 8:52 ` [U-Boot] [PATCH v2 0/3] spl: USB Gadget cleanup B, Ravi
2016-11-15 20:40 ` Stefan Agner
2016-11-16 7:07 ` B, Ravi
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=20161112191308.22185-2-stefan@agner.ch \
--to=stefan@agner.ch \
--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 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.