spl: Convert spi to spl_load

This converts the spi load method to use spl_load. The address used for
LOAD_FIT_FULL may be different, but there are no in-tree users of that
config. Since payload_offs is only used without OS_BOOT, we defer its
initialization.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 3e08ac7c1a2636b3001d856349f1d27ad00c3de5..f49e534b749278662c064d57df90393923ab3ab2 100644 (file)
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -12,11 +12,11 @@
 #include <image.h>
 #include <imx_container.h>
 #include <log.h>
-#include <mapmem.h>
 #include <spi.h>
 #include <spi_flash.h>
 #include <errno.h>
 #include <spl.h>
+#include <spl_load.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/ofnode.h>
@@ -95,9 +95,9 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
        int err = 0;
        unsigned int payload_offs;
        struct spi_flash *flash;
-       struct legacy_img_hdr *header;
        unsigned int sf_bus = spl_spi_boot_bus();
        unsigned int sf_cs = spl_spi_boot_cs();
+       struct spl_load_info load;
 
        /*
         * Load U-Boot image from SPI flash into RAM
@@ -112,77 +112,23 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
                return -ENODEV;
        }
 
-       payload_offs = spl_spi_get_uboot_offs(flash);
-
-       header = spl_get_load_buffer(-sizeof(*header), sizeof(*header));
+#if CONFIG_IS_ENABLED(OS_BOOT)
+       if (!spl_start_uboot() && !spi_load_image_os(spl_image, bootdev, flash, header))
+               return 0;
+#endif
 
+       payload_offs = spl_spi_get_uboot_offs(flash);
        if (CONFIG_IS_ENABLED(OF_REAL)) {
                payload_offs = ofnode_conf_read_int("u-boot,spl-payload-offset",
                                                    payload_offs);
        }
 
-#if CONFIG_IS_ENABLED(OS_BOOT)
-       if (spl_start_uboot() || spi_load_image_os(spl_image, bootdev, flash, header))
-#endif
-       {
-               /* Load u-boot, mkimage header is 64 bytes. */
-               err = spi_flash_read(flash, payload_offs, sizeof(*header),
-                                    (void *)header);
-               if (err) {
-                       debug("%s: Failed to read from SPI flash (err=%d)\n",
-                             __func__, err);
-                       return err;
-               }
-
-               if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) &&
-                   image_get_magic(header) == FDT_MAGIC) {
-                       u32 size = roundup(fdt_totalsize(header), 4);
-
-                       err = spi_flash_read(flash, payload_offs,
-                                            size,
-                                            map_sysmem(CONFIG_SYS_LOAD_ADDR,
-                                                       size));
-                       if (err)
-                               return err;
-                       err = spl_parse_image_header(spl_image, bootdev,
-                                       phys_to_virt(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");
-                       load.priv = flash;
-                       spl_set_bl_len(&load, 1);
-                       load.read = spl_spi_fit_read;
-                       err = spl_load_simple_fit(spl_image, &load,
-                                                 payload_offs,
-                                                 header);
-               } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER) &&
-                          valid_container_hdr((void *)header)) {
-                       struct spl_load_info load;
-
-                       load.priv = flash;
-                       spl_set_bl_len(&load, 1);
-                       load.read = spl_spi_fit_read;
-
-                       err = spl_load_imx_container(spl_image, &load,
-                                                    payload_offs);
-               } else {
-                       err = spl_parse_image_header(spl_image, bootdev, header);
-                       if (err)
-                               return err;
-                       err = spi_flash_read(flash, payload_offs + spl_image->offset,
-                                            spl_image->size,
-                                            map_sysmem(spl_image->load_addr,
-                                                       spl_image->size));
-               }
-               if (IS_ENABLED(CONFIG_SPI_FLASH_SOFT_RESET)) {
-                       err = spi_nor_remove(flash);
-                       if (err)
-                               return err;
-               }
-       }
-
+       load.priv = flash;
+       spl_set_bl_len(&load, 1);
+       load.read = spl_spi_fit_read;
+       err = spl_load(spl_image, bootdev, &load, 0, payload_offs);
+       if (IS_ENABLED(CONFIG_SPI_FLASH_SOFT_RESET))
+               err = spi_nor_remove(flash);
        return err;
 }
 /* Use priorty 1 so that boards can override this */

diff --git a/include/spl_load.h b/include/spl_load.h
index 2a20e866cd86c4a25aaeae19f0f086e2ece72367..1c2b296c0a2c54940bdaf932b183079f87babf63 100644 (file)
--- a/include/spl_load.h
+++ b/include/spl_load.h
@@ -103,6 +103,7 @@ static inline int _spl_load(struct spl_image_info *spl_image,
        IS_ENABLED(CONFIG_SPL_NET) + \
        IS_ENABLED(CONFIG_SPL_NOR_SUPPORT) + \
        IS_ENABLED(CONFIG_SPL_SEMIHOSTING) + \
+       IS_ENABLED(CONFIG_SPL_SPI_LOAD) + \
        0
 
 #if SPL_LOAD_USERS > 1

diff --git a/test/image/spl_load_spi.c b/test/image/spl_load_spi.c
index 8f9b6e0139bcc0914046496aa38baf9eb7c47a71..54a95465e239ec3bd9d35c72582cecccdc45e20a 100644 (file)
--- a/test/image/spl_load_spi.c
+++ b/test/image/spl_load_spi.c
@@ -34,6 +34,7 @@ static int spl_test_spi(struct unit_test_state *uts, const char *test_name,
                                spl_test_spi_write_image);
 }
 SPL_IMG_TEST(spl_test_spi, LEGACY, DM_FLAGS);
+SPL_IMG_TEST(spl_test_spi, LEGACY_LZMA, DM_FLAGS);
 SPL_IMG_TEST(spl_test_spi, IMX8, DM_FLAGS);
 SPL_IMG_TEST(spl_test_spi, FIT_INTERNAL, DM_FLAGS);
 #if !IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL)