diff options
| author | Peter Korsgaard <peter.korsgaard@barco.com> | 2013-05-13 08:36:25 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-07 08:37:48 -0400 |
| commit | 79adb7a2b54b0b34ec4defac33d6ee8277976ddf (patch) | |
| tree | c79dfd80ed8da7f3ea474176272b5b43bd794341 /common/spl | |
| parent | 47b8e527448c94d09fc8dbdb6601ea7a605ff955 (diff) | |
| download | talos-obmc-uboot-79adb7a2b54b0b34ec4defac33d6ee8277976ddf.tar.gz talos-obmc-uboot-79adb7a2b54b0b34ec4defac33d6ee8277976ddf.zip | |
spl_mmc: return error from mmc_load_image_{raw, fat} rather than hanging
So we can instead fallback to doing something else on errors.
Signed-off-by: Peter Korsgaard <peter.korsgaard@barco.com>
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl_mmc.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 7efdcb88b7..0c50657dba 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -32,7 +32,7 @@ DECLARE_GLOBAL_DATA_PTR; -static void mmc_load_image_raw(struct mmc *mmc) +static int mmc_load_image_raw(struct mmc *mmc) { unsigned long err; u32 image_size_sectors; @@ -61,14 +61,14 @@ static void mmc_load_image_raw(struct mmc *mmc) image_size_sectors, (void *)spl_image.load_addr); end: - if (err == 0) { + if (err == 0) printf("spl: mmc blk read err - %lu\n", err); - hang(); - } + + return (err == 0); } #ifdef CONFIG_SPL_FAT_SUPPORT -static void mmc_load_image_fat(struct mmc *mmc) +static int mmc_load_image_fat(struct mmc *mmc) { int err; struct image_header *header; @@ -94,11 +94,11 @@ static void mmc_load_image_fat(struct mmc *mmc) (u8 *)spl_image.load_addr, 0); end: - if (err <= 0) { + if (err <= 0) printf("spl: error reading image %s, err - %d\n", CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, err); - hang(); - } + + return (err <= 0); } #endif @@ -121,17 +121,21 @@ void spl_mmc_load_image(void) printf("spl: mmc init failed: err - %d\n", err); hang(); } + boot_mode = spl_boot_mode(); if (boot_mode == MMCSD_MODE_RAW) { debug("boot mode - RAW\n"); - mmc_load_image_raw(mmc); + err = mmc_load_image_raw(mmc); #ifdef CONFIG_SPL_FAT_SUPPORT } else if (boot_mode == MMCSD_MODE_FAT) { debug("boot mode - FAT\n"); - mmc_load_image_fat(mmc); + err = mmc_load_image_fat(mmc); #endif } else { puts("spl: wrong MMC boot mode\n"); hang(); } + + if (err) + hang(); } |
