diff options
| author | Andrew F. Davis | 2017-02-16 11:18:38 -0600 |
|---|---|---|
| committer | Tom Rini | 2017-03-18 14:28:50 -0400 |
| commit | 24eb39b575d5b077de92a8d7e7947a955adf5679 (patch) | |
| tree | 2058ad4da0946125272bb692858907c533b05e52 /common | |
| parent | f9515756b6d76cde99b385dda905dfb20d31ea48 (diff) | |
spl: Convert CONFIG_SPL_ABORT_ON_RAW_IMAGE into a positive option
CONFIG_SPL_ABORT_ON_RAW_IMAGE causes SPL to abort and move on when it
encounters RAW images, express this same functionality as a positive
option enabling support for RAW images: CONFIG_SPL_RAW_IMAGE_SUPPORT
Also move uses of this to defconfigs.
Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
[trini: Rework Kconfig logic a little, move to common/spl/Kconfig]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/Kconfig | 10 | ||||
| -rw-r--r-- | common/spl/spl.c | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 60ae60c17e3..6abbccdde03 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -13,6 +13,16 @@ config SPL help If you want to build SPL as well as the normal image, say Y. +config SPL_RAW_IMAGE_SUPPORT + bool "Support SPL loading and booting of RAW images" + depends on SPL + default n if (ARCH_MX6 && (SPL_MMC_SUPPORT || SPL_SATA_SUPPORT)) + default y + help + SPL will support loading and booting a RAW image 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 SPL_SYS_MALLOC_SIMPLE bool depends on SPL diff --git a/common/spl/spl.c b/common/spl/spl.c index 2bc8b420274..586d75f4398 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -146,16 +146,18 @@ int spl_parse_image_header(struct spl_image_info *spl_image, } #endif -#ifdef CONFIG_SPL_ABORT_ON_RAW_IMAGE - /* Signature not found, proceed to other boot methods. */ - return -EINVAL; -#else +#ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT /* Signature not found - assume u-boot.bin */ debug("mkimage signature not found - ih_magic = %x\n", header->ih_magic); spl_set_header_raw_uboot(spl_image); +#else + /* RAW image not supported, proceed to other boot methods. */ + debug("Raw boot image support not enabled, proceeding to other boot methods"); + return -EINVAL; #endif } + return 0; } |