Skip to content
Snippets Groups Projects
Commit 2c84c9a4 authored by Guillaume GARDET's avatar Guillaume GARDET Committed by Pantelis Antoniou
Browse files

spl: mmc: Fix raw boot mode (related to commit 4c5bbc23)


As reported by Robert Nelson, commit 4c5bbc23
may break MMC RAW boot mode.
This patch fixes the check path to fix MMC Raw boot mode.

Tested raw boot mode and FS boot mode on a pandaboard (rev. A3).

Reported-by: default avatarRobert Nelson <robertcnelson@gmail.com>
Signed-off-by: default avatarGuillaume GARDET <guillaume.gardet@free.fr>

Cc: Tom Rini <trini@ti.com>
Cc: Robert Nelson <robertcnelson@gmail.com>
Tested-by: default avatarRobert Nelson <robertcnelson@gmail.com>
parent ac0b7298
No related branches found
No related tags found
No related merge requests found
...@@ -172,11 +172,24 @@ void spl_mmc_load_image(void) ...@@ -172,11 +172,24 @@ void spl_mmc_load_image(void)
err = mmc_load_image_raw_sector(mmc, err = mmc_load_image_raw_sector(mmc,
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
#endif #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 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
puts("spl: wrong MMC boot mode\n"); puts("spl: wrong MMC boot mode\n");
#endif #endif
hang(); hang();
} }
if (err) if (err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment