This reworks spl_set_header_raw_uboot to allow having both os boot (which comes with a valid header) and aborting when no valid header is found (thus excluding raw u-boot.bin images).
Signed-off-by: Paul Kocialkowski contact@paulk.fr --- common/spl/spl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/common/spl/spl.c b/common/spl/spl.c index b7ec333..e14ec80 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -129,10 +129,8 @@ int spl_parse_image_header(const struct image_header *header) * is bad, and thus should be skipped silently. */ panic("** no mkimage signature but raw image not supported"); -#elif defined(CONFIG_SPL_ABORT_ON_RAW_IMAGE) - /* Signature not found, proceed to other boot methods. */ - return -EINVAL; -#else +#endif + #ifdef CONFIG_SPL_OS_BOOT ulong start, end;
@@ -147,6 +145,11 @@ int spl_parse_image_header(const struct image_header *header) return 0; } #endif + +#ifdef CONFIG_SPL_ABORT_ON_RAW_IMAGE + /* Signature not found, proceed to other boot methods. */ + return -EINVAL; +#else /* Signature not found - assume u-boot.bin */ debug("mkimage signature not found - ih_magic = %x\n", header->ih_magic);