diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-17 12:10:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-17 12:10:35 -0400 |
| commit | 27bec5c12757c80f598b704477c1bc6c250bcb4c (patch) | |
| tree | 24920d248e78373128e603dd9a13584eb73be2d7 /common/spl/spl_nor.c | |
| parent | d6b7757e41d22e08f21f58d3fe9183a150582f61 (diff) | |
| parent | 291000894ed4d6257830baba547764b86e335b5c (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'common/spl/spl_nor.c')
| -rw-r--r-- | common/spl/spl_nor.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index d0bd0b0533..da2422f305 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -9,6 +9,7 @@ int spl_nor_load_image(void) { + int ret; /* * Loading of the payload to SDRAM is done with skipping of * the mkimage header in this SPL NOR driver @@ -28,7 +29,9 @@ int spl_nor_load_image(void) if (image_get_os(header) == IH_OS_LINUX) { /* happy - was a Linux */ - spl_parse_image_header(header); + ret = spl_parse_image_header(header); + if (ret) + return ret; memcpy((void *)spl_image.load_addr, (void *)(CONFIG_SYS_OS_BASE + @@ -56,8 +59,10 @@ int spl_nor_load_image(void) * Load real U-Boot from its location in NOR flash to its * defined location in SDRAM */ - spl_parse_image_header( + ret = spl_parse_image_header( (const struct image_header *)CONFIG_SYS_UBOOT_BASE); + if (ret) + return ret; memcpy((void *)(unsigned long)spl_image.load_addr, (void *)(CONFIG_SYS_UBOOT_BASE + sizeof(struct image_header)), |