Merge git://git.denx.de/u-boot-socfpga

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

diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index d0bd0b05333ba3bcb993f9bd9908efb5c9a16dc0..bb6194fafdc6c678d7c3669b1fef400409261899 100644 (file)
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -1,19 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <spl.h>
 
-int spl_nor_load_image(void)
+static int spl_nor_load_image(struct spl_image_info *spl_image,
+                             struct spl_boot_device *bootdev)
 {
+       int ret;
        /*
         * Loading of the payload to SDRAM is done with skipping of
         * the mkimage header in this SPL NOR driver
         */
-       spl_image.flags |= SPL_COPY_PAYLOAD_ONLY;
+       spl_image->flags |= SPL_COPY_PAYLOAD_ONLY;
 
 #ifdef CONFIG_SPL_OS_BOOT
        if (!spl_start_uboot()) {
@@ -28,20 +29,16 @@ int spl_nor_load_image(void)
                if (image_get_os(header) == IH_OS_LINUX) {
                        /* happy - was a Linux */
 
-                       spl_parse_image_header(header);
+                       ret = spl_parse_image_header(spl_image, header);
+                       if (ret)
+                               return ret;
 
-                       memcpy((void *)spl_image.load_addr,
+                       memcpy((void *)spl_image->load_addr,
                               (void *)(CONFIG_SYS_OS_BASE +
                                        sizeof(struct image_header)),
-                              spl_image.size);
+                              spl_image->size);
 
-                       /*
-                        * Copy DT blob (fdt) to SDRAM. Passing pointer to
-                        * flash doesn't work (16 KiB should be enough for DT)
-                        */
-                       memcpy((void *)CONFIG_SYS_SPL_ARGS_ADDR,
-                              (void *)(CONFIG_SYS_FDT_BASE),
-                              (16 << 10));
+                       spl_image->arg = (void *)CONFIG_SYS_FDT_BASE;
 
                        return 0;
                } else {
@@ -56,12 +53,15 @@ int spl_nor_load_image(void)
         * Load real U-Boot from its location in NOR flash to its
         * defined location in SDRAM
         */
-       spl_parse_image_header(
+       ret = spl_parse_image_header(spl_image,
                        (const struct image_header *)CONFIG_SYS_UBOOT_BASE);
+       if (ret)
+               return ret;
 
-       memcpy((void *)(unsigned long)spl_image.load_addr,
+       memcpy((void *)(unsigned long)spl_image->load_addr,
               (void *)(CONFIG_SYS_UBOOT_BASE + sizeof(struct image_header)),
-              spl_image.size);
+              spl_image->size);
 
        return 0;
 }
+SPL_LOAD_IMAGE_METHOD("NOR", 0, BOOT_DEVICE_NOR, spl_nor_load_image);