summaryrefslogtreecommitdiff
path: root/common/spl/spl_ubi.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-09-24 18:19:57 -0600
committerTom Rini <trini@konsulko.com>2016-10-06 14:53:36 -0400
commitecdfd69a4be55363589e8185ff151b02e6c36cfa (patch)
treeb625ae78bfe96236f62320061a1a667f4d8e446d /common/spl/spl_ubi.c
parenta807ab33035fe2e9b63aac2e7475525ca8d90adc (diff)
downloadu-boot-imx-ecdfd69a4be55363589e8185ff151b02e6c36cfa.zip
u-boot-imx-ecdfd69a4be55363589e8185ff151b02e6c36cfa.tar.gz
u-boot-imx-ecdfd69a4be55363589e8185ff151b02e6c36cfa.tar.bz2
spl: Convert boot_device into a struct
At present some spl_xxx_load_image() functions take a parameter and some don't. Of those that do, most take an integer but one takes a string. Convert this parameter into a struct so that we can pass all functions the same thing. This will allow us to use a common function signature. 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c
index 5198bab..d64e6cf 100644
--- a/common/spl/spl_ubi.c
+++ b/common/spl/spl_ubi.c
@@ -12,14 +12,14 @@
#include <ubispl.h>
#include <spl.h>
-int spl_ubi_load_image(u32 boot_device)
+int spl_ubi_load_image(struct spl_boot_device *bootdev)
{
struct image_header *header;
struct ubispl_info info;
struct ubispl_load volumes[2];
int ret = 1;
- switch (boot_device) {
+ switch (bootdev->boot_device) {
#ifdef CONFIG_SPL_NAND_SUPPORT
case BOOT_DEVICE_NAND:
nand_init();
@@ -71,7 +71,7 @@ int spl_ubi_load_image(u32 boot_device)
spl_parse_image_header(&spl_image, header);
out:
#ifdef CONFIG_SPL_NAND_SUPPORT
- if (boot_device == BOOT_DEVICE_NAND)
+ if (bootdev->boot_device == BOOT_DEVICE_NAND)
nand_deselect();
#endif
return ret;