diff options
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl.c | 12 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c | 1 | ||||
| -rw-r--r-- | common/spl/spl_sata.c | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index cd75bbc4ce..8e1fb40c47 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 } } diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index c2e596be69..e580f2291a 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -10,7 +10,6 @@ #include <spl.h> #include <asm/u-boot.h> #include <mmc.h> -#include <version.h> #include <image.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index d9eb2d6687..2a5eb29857 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -15,7 +15,6 @@ #include <sata.h> #include <scsi.h> #include <fat.h> -#include <version.h> #include <image.h> DECLARE_GLOBAL_DATA_PTR; |