diff options
| author | Simon Glass <sjg@chromium.org> | 2016-09-24 18:19:53 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-06 14:48:17 -0400 |
| commit | 71316c1d8c1799b444d14cfb00eaacb6cf1ce44a (patch) | |
| tree | d7c0b1c644dfdeed26c7cfe5804a7dbdd8584026 /drivers/mtd | |
| parent | d95ceb97c0ca158605372634a860651ca925915a (diff) | |
spl: Add a parameter to spl_parse_image_header()
Instead of using the global spl_image variable, pass the required struct in
as an argument.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/spi/spi_spl_load.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/spi/sunxi_spi_spl.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/spi/spi_spl_load.c b/drivers/mtd/spi/spi_spl_load.c index bac1e85af3..ac5eae3323 100644 --- a/drivers/mtd/spi/spi_spl_load.c +++ b/drivers/mtd/spi/spi_spl_load.c @@ -32,7 +32,7 @@ static int spi_load_image_os(struct spi_flash *flash, if (image_get_magic(header) != IH_MAGIC) return -1; - err = spl_parse_image_header(header); + err = spl_parse_image_header(&spl_image, header); if (err) return err; @@ -110,7 +110,7 @@ int spl_spi_load_image(void) CONFIG_SYS_SPI_U_BOOT_OFFS, header); } else { - err = spl_parse_image_header(header); + err = spl_parse_image_header(&spl_image, header); if (err) return err; err = spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, diff --git a/drivers/mtd/spi/sunxi_spi_spl.c b/drivers/mtd/spi/sunxi_spi_spl.c index e3ded5b4e8..a992bfaca1 100644 --- a/drivers/mtd/spi/sunxi_spi_spl.c +++ b/drivers/mtd/spi/sunxi_spi_spl.c @@ -271,7 +271,7 @@ int spl_spi_load_image(void) spi0_init(); spi0_read_data((void *)header, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40); - err = spl_parse_image_header(header); + err = spl_parse_image_header(&spl_image, header); if (err) return err; |