From: Tom Rini <trini@konsulko.com>
Date: Fri, 6 Dec 2019 14:56:03 +0000 (-0500)
Subject: Revert "spl: fix entry_point equal to load_addr"
X-Git-Tag: v2025.01-rc5-pxa1908~2654
X-Git-Url: http://git.dujemihanovic.xyz/img/html/static/%7B%7B?a=commitdiff_plain;h=edbb8e09183e6c232b14ed1a087f93b7f0b560ac;p=u-boot.git

Revert "spl: fix entry_point equal to load_addr"

Due to the (seemingly bogus) assumption of a default
CONFIG_SYS_UBOOT_START value we will revert this change for now and
evaluate it again for the next release along with changes to
CONFIG_SYS_UBOOT_START.

This reverts commit d3e97b53c1f2464f4898226de7d89abf242e4aa8.

Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 24da164b43..d51dbe9942 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -264,9 +264,9 @@ int spl_parse_image_header(struct spl_image_info *spl_image,
 			spl_image->entry_point = image_get_ep(header);
 			spl_image->size = image_get_data_size(header);
 		} else {
-			spl_image->entry_point = image_get_ep(header);
+			spl_image->entry_point = image_get_load(header);
 			/* Load including the header */
-			spl_image->load_addr = image_get_load(header) -
+			spl_image->load_addr = spl_image->entry_point -
 				header_size;
 			spl_image->size = image_get_data_size(header) +
 				header_size;