From: Andrew F. Davis <afd@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v5 2/6] spl: Add option to enable SPL Legacy image support
Date: Wed, 15 Feb 2017 13:45:47 -0600 [thread overview]
Message-ID: <20170215194551.18732-3-afd@ti.com> (raw)
In-Reply-To: <20170215194551.18732-1-afd@ti.com>
Add a Kconfig option that enables Legacy image support, this allows
boards to explicitly disable this, for instance when needed for
security reasons.
Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
Kconfig | 8 ++++++++
common/spl/spl.c | 10 ++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/Kconfig b/Kconfig
index cfc8f929ee..8504199493 100644
--- a/Kconfig
+++ b/Kconfig
@@ -299,6 +299,14 @@ config SPL_RAW_IMAGE_SUPPORT
is y. If this is not set, SPL will move on to other available
boot media to find a suitable image.
+config SPL_LEGACY_IMAGE_SUPPORT
+ bool "Support SPL loading and booting of Legacy images"
+ default y
+ help
+ SPL will support loading and booting Legacy images when this option
+ is y. If this is not set, SPL will move on to other available
+ boot media to find a suitable image.
+
config SYS_CLK_FREQ
depends on ARC || ARCH_SUNXI
int "CPU clock frequency"
diff --git a/common/spl/spl.c b/common/spl/spl.c
index da8f55eef6..3d6c0ecba1 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -93,9 +93,10 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image)
int spl_parse_image_header(struct spl_image_info *spl_image,
const struct image_header *header)
{
- u32 header_size = sizeof(struct image_header);
-
if (image_get_magic(header) == IH_MAGIC) {
+#ifdef CONFIG_SPL_LEGACY_IMAGE_SUPPORT
+ u32 header_size = sizeof(struct image_header);
+
if (spl_image->flags & SPL_COPY_PAYLOAD_ONLY) {
/*
* On some system (e.g. powerpc), the load-address and
@@ -118,6 +119,11 @@ int spl_parse_image_header(struct spl_image_info *spl_image,
debug("spl: payload image: %.*s load addr: 0x%lx size: %d\n",
(int)sizeof(spl_image->name), spl_image->name,
spl_image->load_addr, spl_image->size);
+#else
+ /* LEGACY image not supported */
+ debug("Legacy boot image support not enabled, proceeding to other boot methods");
+ return -EINVAL;
+#endif
} else {
#ifdef CONFIG_SPL_PANIC_ON_RAW_IMAGE
/*
--
2.11.0
next prev parent reply other threads:[~2017-02-15 19:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 19:45 [U-Boot] [PATCH v5 0/6] Allow disabling non-FIT image loading from SPL Andrew F. Davis
2017-02-15 19:45 ` [U-Boot] [PATCH v5 1/6] spl: Convert CONFIG_SPL_ABORT_ON_RAW_IMAGE into a positive option Andrew F. Davis
2017-02-15 23:59 ` Tom Rini
2017-02-15 19:45 ` Andrew F. Davis [this message]
2017-02-15 23:59 ` [U-Boot] [PATCH v5 2/6] spl: Add option to enable SPL Legacy image support Tom Rini
2017-02-15 19:45 ` [U-Boot] [PATCH v5 3/6] ARM: AM335x: Disable non-FIT based image loading for HS devices Andrew F. Davis
2017-02-15 19:45 ` [U-Boot] [PATCH v5 4/6] ARM: AM43xx: " Andrew F. Davis
2017-02-15 19:45 ` [U-Boot] [PATCH v5 5/6] ARM: AM57xx: " Andrew F. Davis
2017-02-15 19:45 ` [U-Boot] [PATCH v5 6/6] ARM: DRA7xx: " Andrew F. Davis
2017-02-15 23:59 ` [U-Boot] [PATCH v5 0/6] Allow disabling non-FIT image loading from SPL Tom Rini
2017-02-16 14:40 ` Andrew F. Davis
2017-02-16 14:51 ` Tom Rini
2017-02-16 17:14 ` Andrew F. Davis
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=20170215194551.18732-3-afd@ti.com \
--to=afd@ti.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 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.