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_nand.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_nand.c')
| -rw-r--r-- | common/spl/spl_nand.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 79388ff326..bbd9546987 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -32,7 +32,10 @@ static int spl_nand_load_element(int offset, struct image_header *header) if (err) return err; - spl_parse_image_header(header); + err = spl_parse_image_header(header); + if (err) + return err; + return nand_spl_load_image(offset, spl_image.size, (void *)(unsigned long)spl_image.load_addr); } @@ -77,7 +80,9 @@ int spl_nand_load_image(void) /* load linux */ nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS, sizeof(*header), (void *)header); - spl_parse_image_header(header); + err = spl_parse_image_header(header); + if (err) + return err; if (header->ih_os == IH_OS_LINUX) { /* happy - was a linux */ err = nand_spl_load_image( |