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

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

diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 7df708de9b0f11b5a103b0036853ad3b5088c8bd..5270401db0347270a23b7b33a27898b1d0d04ae9 100644 (file)
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -4,6 +4,8 @@
  */
 
 #include <common.h>
+#include <image.h>
+#include <log.h>
 #include <spl.h>
 
 static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
@@ -24,7 +26,6 @@ unsigned long __weak spl_nor_get_uboot_base(void)
 static int spl_nor_load_image(struct spl_image_info *spl_image,
                              struct spl_boot_device *bootdev)
 {
-       int ret;
        __maybe_unused const struct image_header *header;
        __maybe_unused struct spl_load_info load;
 
@@ -43,6 +44,8 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
                header = (const struct image_header *)CONFIG_SYS_OS_BASE;
 #ifdef CONFIG_SPL_LOAD_FIT
                if (image_get_magic(header) == FDT_MAGIC) {
+                       int ret;
+
                        debug("Found FIT\n");
                        load.bl_len = 1;
                        load.read = spl_nor_load_read;
@@ -51,11 +54,17 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
                                                  CONFIG_SYS_OS_BASE,
                                                  (void *)header);
 
+#if defined CONFIG_SYS_SPL_ARGS_ADDR && defined CONFIG_CMD_SPL_NOR_OFS
+                       memcpy((void *)CONFIG_SYS_SPL_ARGS_ADDR,
+                              (void *)CONFIG_CMD_SPL_NOR_OFS,
+                              CONFIG_CMD_SPL_WRITE_SIZE);
+#endif
                        return ret;
                }
 #endif
                if (image_get_os(header) == IH_OS_LINUX) {
                        /* happy - was a Linux */
+                       int ret;
 
                        ret = spl_parse_image_header(spl_image, header);
                        if (ret)
@@ -88,11 +97,9 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
                debug("Found FIT format U-Boot\n");
                load.bl_len = 1;
                load.read = spl_nor_load_read;
-               ret = spl_load_simple_fit(spl_image, &load,
-                                         spl_nor_get_uboot_base(),
-                                         (void *)header);
-
-               return ret;
+               return spl_load_simple_fit(spl_image, &load,
+                                          spl_nor_get_uboot_base(),
+                                          (void *)header);
        }
 #endif
        if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) {
@@ -102,14 +109,13 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
                                              spl_nor_get_uboot_base());
        }
 
-       ret = spl_parse_image_header(spl_image,
-                       (const struct image_header *)spl_nor_get_uboot_base());
-       if (ret)
-               return ret;
-
-       memcpy((void *)(unsigned long)spl_image->load_addr,
-              (void *)(spl_nor_get_uboot_base() + sizeof(struct image_header)),
-              spl_image->size);
+       /* Legacy image handling */
+       if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_SUPPORT)) {
+               load.bl_len = 1;
+               load.read = spl_nor_load_read;
+               return spl_load_legacy_img(spl_image, &load,
+                                          spl_nor_get_uboot_base());
+       }
 
        return 0;
 }