Merge tag 'u-boot-rockchip-20200531' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 84f20ea4ed94c2da653d1ef93f04e45285baf5ab..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>
@@ -141,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)