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>
This commit is contained in:
Simon Glass
2016-09-24 18:19:57 -06:00
committed by Tom Rini
parent a807ab3303
commit ecdfd69a4b
16 changed files with 71 additions and 48 deletions

View File

@@ -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;