diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-10 09:38:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-10 11:54:07 -0400 |
| commit | 59064346dd2713e5259a32d5ef55792a8f91171b (patch) | |
| tree | 2192fa718f041119e9ba64a9d76f7fe7c546d480 /common | |
| parent | 6d0f45260846b8cafcae6a815178ff8ece7dea7a (diff) | |
| parent | 412ae53aadb53cd63e754d638bafe6e426aeafee (diff) | |
| download | u-boot-imx-59064346dd2713e5259a32d5ef55792a8f91171b.zip u-boot-imx-59064346dd2713e5259a32d5ef55792a8f91171b.tar.gz u-boot-imx-59064346dd2713e5259a32d5ef55792a8f91171b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common')
| -rw-r--r-- | common/image.c | 1 | ||||
| -rw-r--r-- | common/spl/spl.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/common/image.c b/common/image.c index a911aa9..162b682 100644 --- a/common/image.c +++ b/common/image.c @@ -149,6 +149,7 @@ static const table_entry_t uimage_type[] = { { IH_TYPE_MXSIMAGE, "mxsimage", "Freescale MXS Boot Image",}, { IH_TYPE_ATMELIMAGE, "atmelimage", "ATMEL ROM-Boot Image",}, { IH_TYPE_X86_SETUP, "x86_setup", "x86 setup.bin", }, + { IH_TYPE_LPC32XXIMAGE, "lpc32xximage", "LPC32XX Boot Image", }, { -1, "", "", }, }; diff --git a/common/spl/spl.c b/common/spl/spl.c index cd75bbc..8e1fb40 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -101,10 +101,22 @@ void spl_parse_image_header(const struct image_header *header) (int)sizeof(spl_image.name), spl_image.name, spl_image.load_addr, spl_image.size); } else { +#ifdef CONFIG_SPL_PANIC_ON_RAW_IMAGE + /* + * CONFIG_SPL_PANIC_ON_RAW_IMAGE is defined when the + * code which loads images in SPL cannot guarantee that + * absolutely all read errors will be reported. + * An example is the LPC32XX MLC NAND driver, which + * will consider that a completely unreadable NAND block + * is bad, and thus should be skipped silently. + */ + panic("** no mkimage signature but raw image not supported"); +#else /* Signature not found - assume u-boot.bin */ debug("mkimage signature not found - ih_magic = %x\n", header->ih_magic); spl_set_header_raw_uboot(); +#endif } } |