From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 4 Oct 2018 07:29:20 +0000 (+0200)
Subject: spl: ram: Fix u_boot_pos calculation
X-Git-Tag: v2018.11-rc2~48
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=83a64560dd4f352832fbfc508a9c8904809f55d1;p=oweals%2Fu-boot.git

spl: ram: Fix u_boot_pos calculation

The patch:
"spl: Weed out CONFIG_SYS_TEXT_BASE usage"
(sha1: 04ce5427bd3914cab8be78513275a20ab878520a)
introduced bug where assigning to u_boot_pos variable wasn't done
which end up in situation where SPL wasn't able to find out
image on the selected address.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index 619b39a537..5fcc3b1504 100644
--- a/common/spl/spl_ram.c
+++ b/common/spl/spl_ram.c
@@ -63,9 +63,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.
 			 */
-			header = spl_get_load_buffer(-sizeof(*header),
-						     sizeof(*header));
-
+			u_boot_pos = (ulong)spl_get_load_buffer(-sizeof(*header),
+								sizeof(*header));
 		}
 		header = (struct image_header *)map_sysmem(u_boot_pos, 0);