V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

spl: Rework image header parse to allow abort on raw image and os boot 

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>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Paul Kocialkowski 2016-08-24 20:04:42 +02:00 committed by Tom Rini
parent 7302fbb31d
commit 85a3772973
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/spl/spl.c
View File

@ -129,10 +129,8 @@ int spl_parse_image_header(const struct image_header *header)
* is bad, and thus should be skipped silently. * is bad, and thus should be skipped silently.
*/ */
panic("** no mkimage signature but raw image not supported"); panic("** no mkimage signature but raw image not supported");
#elif defined(CONFIG_SPL_ABORT_ON_RAW_IMAGE) #endif
/* Signature not found, proceed to other boot methods. */
return -EINVAL;
#else
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT
ulong start, end; ulong start, end;
@ -147,6 +145,11 @@ int spl_parse_image_header(const struct image_header *header)
return 0; return 0;
} }
#endif #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 */ /* Signature not found - assume u-boot.bin */
debug("mkimage signature not found - ih_magic = %x\n", debug("mkimage signature not found - ih_magic = %x\n",
header->ih_magic); header->ih_magic);