diff options
| author | Marek Vasut <marex@denx.de> | 2016-04-29 00:44:54 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-05-17 17:52:20 +0200 |
| commit | 7e0f22674ae871460706f9cc8653487bb51e0804 (patch) | |
| tree | 604b55f32c78eee29614bfd6a99d7525f168384d /drivers | |
| parent | 249092fa81f3dd3fee94fd05973833e30405f3c4 (diff) | |
| download | talos-obmc-uboot-7e0f22674ae871460706f9cc8653487bb51e0804.tar.gz talos-obmc-uboot-7e0f22674ae871460706f9cc8653487bb51e0804.zip | |
SPL: Let spl_parse_image_header() return value
Allow the spl_parse_image_header() to return value. This is convenient
for controlling the SPL boot flow if the loaded image is corrupted.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Peng Fan <van.freenix@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/spi/spi_spl_load.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/mtd/spi/spi_spl_load.c b/drivers/mtd/spi/spi_spl_load.c index ca56fe9015..46c98a9cee 100644 --- a/drivers/mtd/spi/spi_spl_load.c +++ b/drivers/mtd/spi/spi_spl_load.c @@ -23,6 +23,8 @@ static int spi_load_image_os(struct spi_flash *flash, struct image_header *header) { + int err; + /* Read for a header, parse or error out. */ spi_flash_read(flash, CONFIG_SYS_SPI_KERNEL_OFFS, 0x40, (void *)header); @@ -30,7 +32,9 @@ static int spi_load_image_os(struct spi_flash *flash, if (image_get_magic(header) != IH_MAGIC) return -1; - spl_parse_image_header(header); + err = spl_parse_image_header(header); + if (err) + return err; spi_flash_read(flash, CONFIG_SYS_SPI_KERNEL_OFFS, spl_image.size, (void *)spl_image.load_addr); @@ -81,7 +85,9 @@ int spl_spi_load_image(void) if (err) return err; - spl_parse_image_header(header); + err = spl_parse_image_header(header); + if (err) + return err; err = spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, spl_image.size, (void *)spl_image.load_addr); } |
