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>

diff --git a/arch/arm/mach-uniphier/boot-mode/spl_board.c b/arch/arm/mach-uniphier/boot-mode/spl_board.c
index 86292b6f59ef16d55bf38db990de85d7ebd39d2e..63ab41ce1b31defe4985a7429a52091de45141eb 100644 (file)
--- a/arch/arm/mach-uniphier/boot-mode/spl_board.c
+++ b/arch/arm/mach-uniphier/boot-mode/spl_board.c
@@ -113,7 +113,7 @@ int spl_board_load_image(void)
                return ret;
        }
 
-       ret = spl_parse_image_header((void *)CONFIG_SYS_TEXT_BASE);
+       ret = spl_parse_image_header(&spl_image, (void *)CONFIG_SYS_TEXT_BASE);
        if (ret)
                return ret;
 

diff --git a/common/spl/spl.c b/common/spl/spl.c
index b664cc7b21e8624d953e496c1d8dd53b13172e34..7f67d41e49c8784867f87b57d68584cfed7856ef 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -91,33 +91,34 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image)
        spl_image->name = "U-Boot";
 }
 
-int spl_parse_image_header(const struct image_header *header)
+int spl_parse_image_header(struct spl_image_info *spl_image,
+                          const struct image_header *header)
 {
        u32 header_size = sizeof(struct image_header);
 
        if (image_get_magic(header) == IH_MAGIC) {
-               if (spl_image.flags & SPL_COPY_PAYLOAD_ONLY) {
+               if (spl_image->flags & SPL_COPY_PAYLOAD_ONLY) {
                        /*
                         * On some system (e.g. powerpc), the load-address and
                         * entry-point is located at address 0. We can't load
                         * to 0-0x40. So skip header in this case.
                         */
-                       spl_image.load_addr = image_get_load(header);
-                       spl_image.entry_point = image_get_ep(header);
-                       spl_image.size = image_get_data_size(header);
+                       spl_image->load_addr = image_get_load(header);
+                       spl_image->entry_point = image_get_ep(header);
+                       spl_image->size = image_get_data_size(header);
                } else {
-                       spl_image.entry_point = image_get_load(header);
+                       spl_image->entry_point = image_get_load(header);
                        /* Load including the header */
-                       spl_image.load_addr = spl_image.entry_point -
+                       spl_image->load_addr = spl_image->entry_point -
                                header_size;
-                       spl_image.size = image_get_data_size(header) +
+                       spl_image->size = image_get_data_size(header) +
                                header_size;
                }
-               spl_image.os = image_get_os(header);
-               spl_image.name = image_get_name(header);
+               spl_image->os = image_get_os(header);
+               spl_image->name = image_get_name(header);
                debug("spl: payload image: %.*s load addr: 0x%x size: %d\n",
-                       (int)sizeof(spl_image.name), spl_image.name,
-                       spl_image.load_addr, spl_image.size);
+                       (int)sizeof(spl_image->name), spl_image->name,
+                       spl_image->load_addr, spl_image->size);
        } else {
 #ifdef CONFIG_SPL_PANIC_ON_RAW_IMAGE
                /*
@@ -135,13 +136,13 @@ int spl_parse_image_header(const struct image_header *header)
                ulong start, end;
 
                if (!bootz_setup((ulong)header, &start, &end)) {
-                       spl_image.name = "Linux";
-                       spl_image.os = IH_OS_LINUX;
-                       spl_image.load_addr = CONFIG_SYS_LOAD_ADDR;
-                       spl_image.entry_point = CONFIG_SYS_LOAD_ADDR;
-                       spl_image.size = end - start;
+                       spl_image->name = "Linux";
+                       spl_image->os = IH_OS_LINUX;
+                       spl_image->load_addr = CONFIG_SYS_LOAD_ADDR;
+                       spl_image->entry_point = CONFIG_SYS_LOAD_ADDR;
+                       spl_image->size = end - start;
                        debug("spl: payload zImage, load addr: 0x%x size: %d\n",
-                             spl_image.load_addr, spl_image.size);
+                             spl_image->load_addr, spl_image->size);
                        return 0;
                }
 #endif
@@ -153,7 +154,7 @@ int spl_parse_image_header(const struct image_header *header)
                /* Signature not found - assume u-boot.bin */
                debug("mkimage signature not found - ih_magic = %x\n",
                        header->ih_magic);
-               spl_set_header_raw_uboot(&spl_image);
+               spl_set_header_raw_uboot(spl_image);
 #endif
        }
        return 0;
@@ -209,7 +210,7 @@ static int spl_ram_load_image(void)
                header = (struct image_header *)
                        (CONFIG_SYS_TEXT_BASE - sizeof(struct image_header));
 
-               spl_parse_image_header(header);
+               spl_parse_image_header(&spl_image, header);
        }
 
        return 0;

diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index a85dc85ffef76e97a96750337471573df404957f..e5af24ec8b8cc0b9f975d71ca3e750ac44f292ad 100644 (file)
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -48,7 +48,7 @@ int spl_load_image_ext(struct blk_desc *block_dev,
                goto end;
        }
 
-       err = spl_parse_image_header(header);
+       err = spl_parse_image_header(&spl_image, header);
        if (err < 0) {
                puts("spl: ext: failed to parse image header\n");
                goto end;

diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 73d33f54fc134b81c1169f97900102310d4729b6..68702a2b5ad73cfa6b7f0aa6aa270a1ee5a75c82 100644 (file)
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -84,7 +84,7 @@ int spl_load_image_fat(struct blk_desc *block_dev,
 
                return spl_load_simple_fit(&load, 0, header);
        } else {
-               err = spl_parse_image_header(header);
+               err = spl_parse_image_header(&spl_image, header);
                if (err)
                        goto end;
 

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 7c7f32959b224a44b789bc8b4642c60b2e28655f..97c11b37f66b0e543dd06934ab50598aceeaff07 100644 (file)
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -25,7 +25,7 @@ static int mmc_load_legacy(struct mmc *mmc, ulong sector,
        unsigned long count;
        int ret;
 
-       ret = spl_parse_image_header(header);
+       ret = spl_parse_image_header(&spl_image, header);
        if (ret)
                return ret;
 

diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index 8f9bd5da333bb55c8d581d1b38e35b4f330b746a..f25220f1721be0da088d8698e0e9a41a17159537 100644 (file)
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -59,7 +59,7 @@ static int spl_nand_load_element(int offset, struct image_header *header)
                load.read = spl_nand_fit_read;
                return spl_load_simple_fit(&load, offset, header);
        } else {
-               err = spl_parse_image_header(header);
+               err = spl_parse_image_header(&spl_image, header);
                if (err)
                        return err;
                return nand_spl_load_image(offset, spl_image.size,
@@ -107,7 +107,7 @@ int spl_nand_load_image(void)
                /* load linux */
                nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
                        sizeof(*header), (void *)header);
-               err = spl_parse_image_header(header);
+               err = spl_parse_image_header(&spl_image, header);
                if (err)
                        return err;
                if (header->ih_os == IH_OS_LINUX) {

diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index ae71d26f0a61e730d88f6c0e93fc1358a6c5ec5a..f417d177eb100d172a3b250caafdd93a514c945c 100644 (file)
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -34,5 +34,6 @@ int spl_net_load_image(const char *device)
                printf("Problem booting with BOOTP\n");
                return rv;
        }
-       return spl_parse_image_header((struct image_header *)load_addr);
+       return spl_parse_image_header(&spl_image,
+                                     (struct image_header *)load_addr);
 }

diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 8ea874c888e8d6d4c8c2594458e1f2641f33fc47..57771e8f57833327f5e67c108036e7efc861dc6e 100644 (file)
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -29,7 +29,7 @@ int spl_nor_load_image(void)
                if (image_get_os(header) == IH_OS_LINUX) {
                        /* happy - was a Linux */
 
-                       ret = spl_parse_image_header(header);
+                       ret = spl_parse_image_header(&spl_image, header);
                        if (ret)
                                return ret;
 
@@ -59,7 +59,7 @@ int spl_nor_load_image(void)
         * Load real U-Boot from its location in NOR flash to its
         * defined location in SDRAM
         */
-       ret = spl_parse_image_header(
+       ret = spl_parse_image_header(&spl_image,
                        (const struct image_header *)CONFIG_SYS_UBOOT_BASE);
        if (ret)
                return ret;

diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c
index 1a28a84e4407a252706a2a3eb4870dd72b39503f..8d2c51bc479643f8a3056efffe52e310b94331c8 100644 (file)
--- a/common/spl/spl_onenand.c
+++ b/common/spl/spl_onenand.c
@@ -26,7 +26,7 @@ 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);
-       ret = spl_parse_image_header(header);
+       ret = spl_parse_image_header(&spl_image, header);
        if (ret)
                return ret;
        onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,

diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c
index f97e1ef680bdb3e4f3cdcf08c95b8f6554d73c05..5198babaae30a3db53f1cc9b4d8386a818b1ad09 100644 (file)
--- a/common/spl/spl_ubi.c
+++ b/common/spl/spl_ubi.c
@@ -54,7 +54,7 @@ int spl_ubi_load_image(u32 boot_device)
                ret = ubispl_load_volumes(&info, volumes, 2);
                if (!ret) {
                        header = (struct image_header *)volumes[0].load_addr;
-                       spl_parse_image_header(header);
+                       spl_parse_image_header(&spl_image, header);
                        puts("Linux loaded.\n");
                        goto out;
                }
@@ -68,7 +68,7 @@ int spl_ubi_load_image(u32 boot_device)
 
        ret = ubispl_load_volumes(&info, volumes, 1);
        if (!ret)
-               spl_parse_image_header(header);
+               spl_parse_image_header(&spl_image, header);
 out:
 #ifdef CONFIG_SPL_NAND_SUPPORT
        if (boot_device == BOOT_DEVICE_NAND)

diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index 5402301c7832e728c5a228f0dfb5b192e7f45208..1323b6f028fb000541a01a31bb806fb78b96e08a 100644 (file)
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -108,8 +108,9 @@ int spl_ymodem_load_image(void)
                while ((res = xyzModem_stream_read(buf, BUF_SIZE, &err)) > 0)
                        size += res;
        } else {
-               spl_parse_image_header((struct image_header *)buf);
-               ret = spl_parse_image_header((struct image_header *)buf);
+               spl_parse_image_header(&spl_image, (struct image_header *)buf);
+               ret = spl_parse_image_header(&spl_image,
+                                            (struct image_header *)buf);
                if (ret)
                        return ret;
                addr = spl_image.load_addr;

diff --git a/drivers/mtd/spi/spi_spl_load.c b/drivers/mtd/spi/spi_spl_load.c
index bac1e85af3fb0ccabb6d477fb010633bb0d3cc01..ac5eae33236946e57b0aedefb0dfe896d5a47678 100644 (file)
--- 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 e3ded5b4e81434d9810b99ba27a5913ed9bfd455..a992bfaca1bebaaca23babdf4d12a18234f55cfd 100644 (file)
--- 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;
 

diff --git a/include/spl.h b/include/spl.h
index c0c5f780178f5836d268fd9bd099c6297422b1a8..1770fd88600930e2e6b552a01456ca7284043551 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -75,11 +75,27 @@ u32 spl_boot_mode(const u32 boot_device);
  * config options: CONFIG_SYS_MONITOR_LEN, CONFIG_SYS_UBOOT_START,
  * CONFIG_SYS_TEXT_BASE.
  *
- * @spl_image: Image to set up
+ * @spl_image: Image description to set up
  */
 void spl_set_header_raw_uboot(struct spl_image_info *spl_image);
 
-int spl_parse_image_header(const struct image_header *header);
+/**
+ * spl_parse_image_header() - parse the image header and set up info
+ *
+ * This parses the legacy image header information at @header and sets up
+ * @spl_image according to what is found. If no image header is found, then
+ * a raw image or bootz is assumed. If CONFIG_SPL_PANIC_ON_RAW_IMAGE is
+ * enabled, then this causes a panic. If CONFIG_SPL_ABORT_ON_RAW_IMAGE is
+ * enabled then U-Boot gives up. Otherwise U-Boot sets up the image using
+ * spl_set_header_raw_uboot(), or possibly the bootz header.
+ *
+ * @spl_image: Image description to set up
+ * @header image header to parse
+ * @return 0 if a header was correctly parsed, -ve on error
+ */
+int spl_parse_image_header(struct spl_image_info *spl_image,
+                          const struct image_header *header);
+
 void spl_board_prepare_for_linux(void);
 void spl_board_prepare_for_boot(void);
 int spl_board_ubi_load_image(u32 boot_device);