summaryrefslogtreecommitdiff
path: root/common/spl/spl.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-12-05 16:37:36 -0500
committerTom Rini <trini@konsulko.com>2019-12-05 16:37:36 -0500
commit28a4516cf154d6f7e738f8e0519b41eccef5af5c (patch)
treea05dc64caed8ae10c8cbfa491994374d17206858 /common/spl/spl.c
parent7e5ee346fc4c26c5f96ae13d599cf31d05fa6772 (diff)
parent8cc738b9fcb5c1b140c721cb4f994ceb185c4c0c (diff)
Merge branch '2019-12-05-master-imports'
- Assorted omapl138_lcdk / da850-evm fixes - FAT fix, add another pytest as well for FAT. - Assorted general fixes
Diffstat (limited to 'common/spl/spl.c')
-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 d51dbe9942f..24da164b438 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_load(header);
+ spl_image->entry_point = image_get_ep(header);
/* Load including the header */
- spl_image->load_addr = spl_image->entry_point -
+ spl_image->load_addr = image_get_load(header) -
header_size;
spl_image->size = image_get_data_size(header) +
header_size;