From 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Tue, 18 Nov 2014 10:44:46 +0100 Subject: 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 Cc: Tom Rini --- common/spl/spl_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'common') diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index d199f0be9b..7bae16beba 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 -- cgit v1.2.1