Merge tag 'efi-2020-07-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 9b74473377f36e4d88eb066d9e2b4d4a6bf6bdbf..2744fb5d520cc309d85a49a02a776cc94a135084 100644 (file)
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -9,6 +9,8 @@
  */
 
 #include <common.h>
+#include <image.h>
+#include <log.h>
 #include <spi.h>
 #include <spi_flash.h>
 #include <errno.h>
@@ -62,6 +64,12 @@ static ulong spl_spi_fit_read(struct spl_load_info *load, ulong sector,
        else
                return 0;
 }
+
+unsigned int __weak spl_spi_get_uboot_offs(struct spi_flash *flash)
+{
+       return CONFIG_SYS_SPI_U_BOOT_OFFS;
+}
+
 /*
  * The main entry for SPI booting. It's necessary that SDRAM is already
  * configured and available since this code loads the main U-Boot image
@@ -71,7 +79,7 @@ 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;
+       unsigned int payload_offs;
        struct spi_flash *flash;
        struct image_header *header;
 
@@ -90,6 +98,8 @@ 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(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
@@ -133,6 +143,17 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
                        err = spl_load_simple_fit(spl_image, &load,
                                                  payload_offs,
                                                  header);
+               } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) {
+                       struct spl_load_info load;
+
+                       load.dev = flash;
+                       load.priv = NULL;
+                       load.filename = NULL;
+                       load.bl_len = 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, header);
                        if (err)