diff options
| author | Nikita Kiryanov <nikita@compulab.co.il> | 2015-11-08 17:11:49 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-18 14:50:02 -0500 |
| commit | 36afd451361dd4386c5527154d94bff4c6c538da (patch) | |
| tree | 0b507fa7fe6b6a110f3bd319d3d8104f5105f7c3 /common/spl/spl_mmc.c | |
| parent | 83cdf6faa677ff8ff39d7852126aad3207fac021 (diff) | |
spl: change return values of spl_*_load_image()
Make spl_*_load_image() functions return a value instead of
hanging if a problem is encountered. This enables main spl code
to make the decision whether to hang or not, thus preparing
it to support alternative boot devices.
Some boot devices (namely nand and spi) do not hang on error.
Instead, they return normally and SPL proceeds to boot the
contents of the load address. This is considered a bug and
is rectified by hanging on error for these devices as well.
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Ian Campbell <ijc@hellion.org.uk>
Cc: Hans De Goede <hdegoede@redhat.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Jagan Teki <jteki@openedev.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/spl/spl_mmc.c')
| -rw-r--r-- | common/spl/spl_mmc.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 7d100faaa0..b68190a265 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -10,6 +10,7 @@ #include <dm.h> #include <spl.h> #include <linux/compiler.h> +#include <errno.h> #include <asm/u-boot.h> #include <errno.h> #include <mmc.h> @@ -220,25 +221,27 @@ int spl_mmc_do_fs_boot(struct mmc *mmc) } #endif -void spl_mmc_load_image(void) +int spl_mmc_load_image(void) { struct mmc *mmc; u32 boot_mode; int err = 0; __maybe_unused int part; - if (spl_mmc_find_device(&mmc)) - hang(); + err = spl_mmc_find_device(&mmc); + if (err) + return err; err = mmc_init(mmc); if (err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: mmc init failed with error: %d\n", err); #endif - hang(); + return err; } boot_mode = spl_boot_mode(); + err = -EINVAL; switch (boot_mode) { case MMCSD_MODE_EMMCBOOT: /* @@ -251,11 +254,12 @@ void spl_mmc_load_image(void) if (part == 7) part = 0; - if (mmc_switch_part(0, part)) { + err = mmc_switch_part(0, part); + if (err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("spl: mmc partition switch failed\n"); #endif - hang(); + return err; } /* Fall through */ case MMCSD_MODE_RAW: @@ -264,18 +268,18 @@ void spl_mmc_load_image(void) if (!spl_start_uboot()) { err = mmc_load_image_raw_os(mmc); if (!err) - return; + return err; } err = mmc_load_image_raw_partition(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION); if (!err) - return; + return err; #if defined(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR) err = mmc_load_image_raw_sector(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); if (!err) - return; + return err; #endif break; case MMCSD_MODE_FS: @@ -283,7 +287,7 @@ void spl_mmc_load_image(void) err = spl_mmc_do_fs_boot(mmc); if (!err) - return; + return err; break; case MMCSD_MODE_UNDEFINED: @@ -293,5 +297,5 @@ void spl_mmc_load_image(void) #endif } - hang(); + return err; } |