summaryrefslogtreecommitdiff
path: root/common/spl/spl_onenand.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-05-17 12:10:35 -0400
committerTom Rini <trini@konsulko.com>2016-05-17 12:10:35 -0400
commit27bec5c12757c80f598b704477c1bc6c250bcb4c (patch)
tree24920d248e78373128e603dd9a13584eb73be2d7 /common/spl/spl_onenand.c
parentd6b7757e41d22e08f21f58d3fe9183a150582f61 (diff)
parent291000894ed4d6257830baba547764b86e335b5c (diff)
downloadu-boot-imx-27bec5c12757c80f598b704477c1bc6c250bcb4c.zip
u-boot-imx-27bec5c12757c80f598b704477c1bc6c250bcb4c.tar.gz
u-boot-imx-27bec5c12757c80f598b704477c1bc6c250bcb4c.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'common/spl/spl_onenand.c')
-rw-r--r--common/spl/spl_onenand.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c
index af7d82e..1a28a84 100644
--- a/common/spl/spl_onenand.c
+++ b/common/spl/spl_onenand.c
@@ -17,6 +17,7 @@
int spl_onenand_load_image(void)
{
struct image_header *header;
+ int ret;
debug("spl: onenand\n");
@@ -25,7 +26,9 @@ int spl_onenand_load_image(void)
/* Load u-boot */
onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
CONFIG_SYS_ONENAND_PAGE_SIZE, (void *)header);
- spl_parse_image_header(header);
+ ret = spl_parse_image_header(header);
+ if (ret)
+ return ret;
onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
spl_image.size, (void *)spl_image.load_addr);