summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-12-06 09:56:03 -0500
committerTom Rini <trini@konsulko.com>2019-12-06 09:56:03 -0500
commitedbb8e09183e6c232b14ed1a087f93b7f0b560ac (patch)
tree484e090046bd4da6b36e52c81486d9ff5d5b16d8 /common
parent28a4516cf154d6f7e738f8e0519b41eccef5af5c (diff)
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>
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl.c4
1 files changed, 2 insertions, 2 deletions
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;