summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorGuillaume GARDET <guillaume.gardet@free.fr>2014-11-18 10:44:46 +0100
committerTom Rini <trini@ti.com>2014-12-08 09:35:42 -0500
commit4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f (patch)
tree3e275ea719a2db8a884ceb6bed94ab3ab2dd9a30 /common
parent69337a9d7988b562ea7099b003204ec5a9548cca (diff)
downloadu-boot-imx-4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f.zip
u-boot-imx-4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f.tar.gz
u-boot-imx-4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f.tar.bz2
spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
In SPL MMC, boot modes are exclusive. So, if MMCSD_MODE_RAW fails, the board hangs. This patch allows to try MMCSD_MODE_FS then, if available. It has been tested on a pandaboard (rev. A3). Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Tom Rini <trini@ti.com>
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl_mmc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index d199f0b..7bae16b 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -123,7 +123,8 @@ void spl_mmc_load_image(void)
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
#endif
#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
- } else if (boot_mode == MMCSD_MODE_FS) {
+ }
+ if (err || boot_mode == MMCSD_MODE_FS) {
debug("boot mode - FS\n");
#ifdef CONFIG_SPL_FAT_SUPPORT
#ifdef CONFIG_SPL_OS_BOOT