summaryrefslogtreecommitdiff
path: root/common/spl
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-01-06 10:44:47 -0500
committerTom Rini <trini@ti.com>2015-01-06 10:44:47 -0500
commit2ed3f9114300b1f11f1f30d9d2478146afc3af0e (patch)
tree77ea5e1d5bc51e9de016d35cb6cc4fda0e1af0d1 /common/spl
parentfc89b2e479f0b75008bab1b59170aa8179ba61fe (diff)
parent2c84c9a40ac19c44c0c9f865fcf6f459c426659e (diff)
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'common/spl')
-rw-r--r--common/spl/spl_mmc.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 7bae16beba..c2e596be69 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -172,11 +172,24 @@ void spl_mmc_load_image(void)
err = mmc_load_image_raw_sector(mmc,
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
#endif
- } else {
+ }
+
+ switch(boot_mode){
+ case MMCSD_MODE_RAW:
+#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
+ case MMCSD_MODE_FS:
+#endif
+#ifdef CONFIG_SUPPORT_EMMC_BOOT
+ case MMCSD_MODE_EMMCBOOT:
+#endif
+ /* Boot mode is ok. Nothing to do. */
+ break;
+ case MMCSD_MODE_UNDEFINED:
+ default:
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
- puts("spl: wrong MMC boot mode\n");
+ puts("spl: wrong MMC boot mode\n");
#endif
- hang();
+ hang();
}
if (err)