Merge branch 'master' of git://git.denx.de/u-boot-socfpga

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

diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index b2645a194806c8ad9b43afaa5239316da3d8bc83..954e91a0045cacf0d287acedb5add9549133ff87 100644 (file)
--- a/common/spl/spl_ram.c
+++ b/common/spl/spl_ram.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2016
  * Xilinx, Inc.
@@ -7,12 +8,12 @@
  *
  * Michal Simek <michal.simek@xilinx.com>
  * Stefan Agner <stefan.agner@toradex.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
+#include <binman_sym.h>
+#include <mapmem.h>
 #include <spl.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 
 #ifndef CONFIG_SPL_LOAD_FIT_ADDRESS
 # define CONFIG_SPL_LOAD_FIT_ADDRESS   0
@@ -34,7 +35,7 @@ static int spl_ram_load_image(struct spl_image_info *spl_image,
 
        header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS;
 
-#if defined(CONFIG_SPL_DFU_SUPPORT)
+#if CONFIG_IS_ENABLED(DFU)
        if (bootdev->boot_device == BOOT_DEVICE_DFU)
                spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0");
 #endif
@@ -48,25 +49,34 @@ static int spl_ram_load_image(struct spl_image_info *spl_image,
                load.read = spl_ram_load_read;
                spl_load_simple_fit(spl_image, &load, 0, header);
        } else {
+               ulong u_boot_pos = binman_sym(ulong, u_boot_any, image_pos);
+
                debug("Legacy image\n");
                /*
                 * Get the header.  It will point to an address defined by
                 * handoff which will tell where the image located inside
-                * the flash. For now, it will temporary fixed to address
-                * pointed by U-Boot.
+                * the flash.
                 */
-               header = (struct image_header *)
-                       (CONFIG_SYS_TEXT_BASE - sizeof(struct image_header));
+               debug("u_boot_pos = %lx\n", u_boot_pos);
+               if (u_boot_pos == BINMAN_SYM_MISSING) {
+                       /*
+                        * No binman support or no information. For now, fix it
+                        * to the address pointed to by U-Boot.
+                        */
+                       u_boot_pos = (ulong)spl_get_load_buffer(-sizeof(*header),
+                                                               sizeof(*header));
+               }
+               header = (struct image_header *)map_sysmem(u_boot_pos, 0);
 
                spl_parse_image_header(spl_image, header);
        }
 
        return 0;
 }
-#if defined(CONFIG_SPL_RAM_DEVICE)
+#if CONFIG_IS_ENABLED(RAM_DEVICE)
 SPL_LOAD_IMAGE_METHOD("RAM", 0, BOOT_DEVICE_RAM, spl_ram_load_image);
 #endif
-#if defined(CONFIG_SPL_DFU_SUPPORT)
+#if CONFIG_IS_ENABLED(DFU)
 SPL_LOAD_IMAGE_METHOD("DFU", 0, BOOT_DEVICE_DFU, spl_ram_load_image);
 #endif