summaryrefslogtreecommitdiff
path: root/common/spl/spl_nor.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-09-24 18:19:53 -0600
committerTom Rini <trini@konsulko.com>2016-10-06 14:48:17 -0400
commit71316c1d8c1799b444d14cfb00eaacb6cf1ce44a (patch)
treed7c0b1c644dfdeed26c7cfe5804a7dbdd8584026 /common/spl/spl_nor.c
parentd95ceb97c0ca158605372634a860651ca925915a (diff)
spl: Add a parameter to spl_parse_image_header()
Instead of using the global spl_image variable, pass the required struct in as an argument. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/spl/spl_nor.c')
-rw-r--r--common/spl/spl_nor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 8ea874c888..57771e8f57 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -29,7 +29,7 @@ int spl_nor_load_image(void)
if (image_get_os(header) == IH_OS_LINUX) {
/* happy - was a Linux */
- ret = spl_parse_image_header(header);
+ ret = spl_parse_image_header(&spl_image, header);
if (ret)
return ret;
@@ -59,7 +59,7 @@ int spl_nor_load_image(void)
* Load real U-Boot from its location in NOR flash to its
* defined location in SDRAM
*/
- ret = spl_parse_image_header(
+ ret = spl_parse_image_header(&spl_image,
(const struct image_header *)CONFIG_SYS_UBOOT_BASE);
if (ret)
return ret;