include: reset: Change to use CONFIG_IS_ENABLED(DM_RESET)

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

diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index b444a3ea2b0c874f7b77bf03af3ab1f1ea7d4cf5..bb6194fafdc6c678d7c3669b1fef400409261899 100644 (file)
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -1,51 +1,67 @@
+// 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>
 
-void 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;
 
-       if (spl_start_uboot()) {
-               /*
-                * Load real U-Boot from its location in NOR flash to its
-                * defined location in SDRAM
-                */
-               spl_parse_image_header(
-                       (const struct image_header *)CONFIG_SYS_UBOOT_BASE);
+#ifdef CONFIG_SPL_OS_BOOT
+       if (!spl_start_uboot()) {
+               const struct image_header *header;
 
-               memcpy((void *)spl_image.load_addr,
-                      (void *)(CONFIG_SYS_UBOOT_BASE +
-                               sizeof(struct image_header)),
-                      spl_image.size);
-       } else {
                /*
                 * Load Linux from its location in NOR flash to its defined
                 * location in SDRAM
                 */
-               spl_parse_image_header(
-                       (const struct image_header *)CONFIG_SYS_OS_BASE);
+               header = (const struct image_header *)CONFIG_SYS_OS_BASE;
 
-               memcpy((void *)spl_image.load_addr,
-                      (void *)(CONFIG_SYS_OS_BASE +
-                               sizeof(struct image_header)),
-                      spl_image.size);
+               if (image_get_os(header) == IH_OS_LINUX) {
+                       /* happy - was a Linux */
 
-               /*
-                * 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));
+                       ret = spl_parse_image_header(spl_image, header);
+                       if (ret)
+                               return ret;
+
+                       memcpy((void *)spl_image->load_addr,
+                              (void *)(CONFIG_SYS_OS_BASE +
+                                       sizeof(struct image_header)),
+                              spl_image->size);
+
+                       spl_image->arg = (void *)CONFIG_SYS_FDT_BASE;
+
+                       return 0;
+               } else {
+                       puts("The Expected Linux image was not found.\n"
+                            "Please check your NOR configuration.\n"
+                            "Trying to start u-boot now...\n");
+               }
        }
+#endif
+
+       /*
+        * Load real U-Boot from its location in NOR flash to its
+        * defined location in SDRAM
+        */
+       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,
+              (void *)(CONFIG_SYS_UBOOT_BASE + sizeof(struct image_header)),
+              spl_image->size);
+
+       return 0;
 }
+SPL_LOAD_IMAGE_METHOD("NOR", 0, BOOT_DEVICE_NOR, spl_nor_load_image);