summaryrefslogtreecommitdiff
path: root/common/spl/spl_ubi.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_ubi.c
parentd95ceb97c0ca158605372634a860651ca925915a (diff)
downloadu-boot-imx-71316c1d8c1799b444d14cfb00eaacb6cf1ce44a.zip
u-boot-imx-71316c1d8c1799b444d14cfb00eaacb6cf1ce44a.tar.gz
u-boot-imx-71316c1d8c1799b444d14cfb00eaacb6cf1ce44a.tar.bz2
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_ubi.c')
-rw-r--r--common/spl/spl_ubi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c
index f97e1ef..5198bab 100644
--- a/common/spl/spl_ubi.c
+++ b/common/spl/spl_ubi.c
@@ -54,7 +54,7 @@ int spl_ubi_load_image(u32 boot_device)
ret = ubispl_load_volumes(&info, volumes, 2);
if (!ret) {
header = (struct image_header *)volumes[0].load_addr;
- spl_parse_image_header(header);
+ spl_parse_image_header(&spl_image, header);
puts("Linux loaded.\n");
goto out;
}
@@ -68,7 +68,7 @@ int spl_ubi_load_image(u32 boot_device)
ret = ubispl_load_volumes(&info, volumes, 1);
if (!ret)
- spl_parse_image_header(header);
+ spl_parse_image_header(&spl_image, header);
out:
#ifdef CONFIG_SPL_NAND_SUPPORT
if (boot_device == BOOT_DEVICE_NAND)