[U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available

[Guillaume Gardet]

Ping.
Just a friendly reminder.

Guillaume

Le 18/11/2014 10:44, Guillaume GARDET a écrit :
> 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 at free.fr>
> Cc: Tom Rini <trini at ti.com>
> ---
>   common/spl/spl_mmc.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
> index ee71f79..2c34b75 100644
> --- a/common/spl/spl_mmc.c
> +++ b/common/spl/spl_mmc.c
> @@ -101,7 +101,8 @@ void spl_mmc_load_image(void)
>   		err = mmc_load_image_raw(mmc,
>   			CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
>   #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