spl: spi: Support full fitImage handling

[u-boot] / common / spl / spl_spi.c

diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index e4cc0d08229f996c0c5689beab38d40417d4e75a..ba60a3a3c5053d07b026d3aeb96914faa6dbf111 100644 (file)
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011 OMICRON electronics GmbH
  *
@@ -5,8 +6,6 @@
  *
  * Copyright (C) 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -15,12 +14,15 @@
 #include <errno.h>
 #include <spl.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #ifdef CONFIG_SPL_OS_BOOT
 /*
  * Load the kernel, check for a valid header we can parse, and if found load
  * the kernel and then device tree.
  */
-static int spi_load_image_os(struct spi_flash *flash,
+static int spi_load_image_os(struct spl_image_info *spl_image,
+                            struct spi_flash *flash,
                             struct image_header *header)
 {
        int err;
@@ -32,12 +34,12 @@ static int spi_load_image_os(struct spi_flash *flash,
        if (image_get_magic(header) != IH_MAGIC)
                return -1;
 
-       err = spl_parse_image_header(&spl_image, header);
+       err = spl_parse_image_header(spl_image, header);
        if (err)
                return err;
 
        spi_flash_read(flash, CONFIG_SYS_SPI_KERNEL_OFFS,
-                      spl_image.size, (void *)spl_image.load_addr);
+                      spl_image->size, (void *)spl_image->load_addr);
 
        /* Read device tree. */
        spi_flash_read(flash, CONFIG_SYS_SPI_ARGS_OFFS,
@@ -65,9 +67,11 @@ static ulong spl_spi_fit_read(struct spl_load_info *load, ulong sector,
  * configured and available since this code loads the main U-Boot image
  * from SPI into SDRAM and starts it from there.
  */
-int spl_spi_load_image(struct spl_boot_device *bootdev)
+static int spl_spi_load_image(struct spl_image_info *spl_image,
+                             struct spl_boot_device *bootdev)
 {
        int err = 0;
+       unsigned payload_offs = CONFIG_SYS_SPI_U_BOOT_OFFS;
        struct spi_flash *flash;
        struct image_header *header;
 
@@ -87,17 +91,36 @@ int spl_spi_load_image(struct spl_boot_device *bootdev)
        /* use CONFIG_SYS_TEXT_BASE as temporary storage area */
        header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
 
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
+       payload_offs = fdtdec_get_config_int(gd->fdt_blob,
+                                            "u-boot,spl-payload-offset",
+                                            payload_offs);
+#endif
+
 #ifdef CONFIG_SPL_OS_BOOT
-       if (spl_start_uboot() || spi_load_image_os(flash, header))
+       if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header))
 #endif
        {
                /* Load u-boot, mkimage header is 64 bytes. */
-               err = spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40,
+               err = spi_flash_read(flash, payload_offs, 0x40,
                                     (void *)header);
-               if (err)
+               if (err) {
+                       debug("%s: Failed to read from SPI flash (err=%d)\n",
+                             __func__, err);
                        return err;
+               }
 
-               if (IS_ENABLED(CONFIG_SPL_LOAD_FIT)) {
+               if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) &&
+                   image_get_magic(header) == FDT_MAGIC) {
+                       err = spi_flash_read(flash, payload_offs,
+                                            roundup(fdt_totalsize(header), 4),
+                                            (void *)CONFIG_SYS_LOAD_ADDR);
+                       if (err)
+                               return err;
+                       err = spl_parse_image_header(spl_image,
+                                       (struct image_header *)CONFIG_SYS_LOAD_ADDR);
+               } else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
+                          image_get_magic(header) == FDT_MAGIC) {
                        struct spl_load_info load;
 
                        debug("Found FIT\n");
@@ -106,18 +129,20 @@ int spl_spi_load_image(struct spl_boot_device *bootdev)
                        load.filename = NULL;
                        load.bl_len = 1;
                        load.read = spl_spi_fit_read;
-                       err = spl_load_simple_fit(&load,
-                                                 CONFIG_SYS_SPI_U_BOOT_OFFS,
+                       err = spl_load_simple_fit(spl_image, &load,
+                                                 payload_offs,
                                                  header);
                } else {
-                       err = spl_parse_image_header(&spl_image, header);
+                       err = spl_parse_image_header(spl_image, header);
                        if (err)
                                return err;
-                       err = spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS,
-                                            spl_image.size,
-                                            (void *)spl_image.load_addr);
+                       err = spi_flash_read(flash, payload_offs,
+                                            spl_image->size,
+                                            (void *)spl_image->load_addr);
                }
        }
 
        return err;
 }
+/* Use priorty 1 so that boards can override this */
+SPL_LOAD_IMAGE_METHOD("SPI", 1, BOOT_DEVICE_SPI, spl_spi_load_image);