common: Drop log.h from common header

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

diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index a15761e309f6291937c09fa68e11139f6a6a326d..df1d5b43d8b52828d7018ae74ae23932f5074910 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,11 +8,11 @@
  *
  * Michal Simek <[email protected]>
  * Stefan Agner <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <binman_sym.h>
+#include <image.h>
+#include <log.h>
 #include <mapmem.h>
 #include <spl.h>
 #include <linux/libfdt.h>
@@ -36,7 +37,7 @@ static int spl_ram_load_image(struct spl_image_info *spl_image,
 
        header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS;
 
-#if CONFIG_IS_ENABLED(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
@@ -50,7 +51,7 @@ 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, pos);
+               ulong u_boot_pos = binman_sym(ulong, u_boot_any, image_pos);
 
                debug("Legacy image\n");
                /*
@@ -64,8 +65,8 @@ static int spl_ram_load_image(struct spl_image_info *spl_image,
                         * No binman support or no information. For now, fix it
                         * to the address pointed to by U-Boot.
                         */
-                       u_boot_pos = CONFIG_SYS_TEXT_BASE -
-                                       sizeof(struct image_header);
+                       u_boot_pos = (ulong)spl_get_load_buffer(-sizeof(*header),
+                                                               sizeof(*header));
                }
                header = (struct image_header *)map_sysmem(u_boot_pos, 0);
 
@@ -77,7 +78,7 @@ static int spl_ram_load_image(struct spl_image_info *spl_image,
 #if CONFIG_IS_ENABLED(RAM_DEVICE)
 SPL_LOAD_IMAGE_METHOD("RAM", 0, BOOT_DEVICE_RAM, spl_ram_load_image);
 #endif
-#if CONFIG_IS_ENABLED(DFU_SUPPORT)
+#if CONFIG_IS_ENABLED(DFU)
 SPL_LOAD_IMAGE_METHOD("DFU", 0, BOOT_DEVICE_DFU, spl_ram_load_image);
 #endif