diff options
| author | Anatolij Gustschin <agust@denx.de> | 2020-04-23 13:07:49 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2020-05-01 18:46:55 +0200 |
| commit | a15d0aa680d2aacbe708d8d87ca2ac5b3b22a893 (patch) | |
| tree | 6c7a8e7c5c8a2d78e07c549a7843a1cf450e5832 /arch/arm/mach-imx/spl.c | |
| parent | ef99f3d9e8e378ab155fbe952ae04413a528e565 (diff) | |
imx: spl: return boot mode for asked MMC device in spl_mmc_boot_mode()
Boards may extend or re-define the boot list in their board_boot_order()
function by modifying spl_boot_list. E.g. a board might boot SPL from a
slow SPI NOR flash and then load the U-Boot from an eMMC or SD-card.
Or it might use additional MMC boot device in spl_boot_list for cases
when the image in SPI NOR flash is not found, so it could fall back to
eMMC, SD-card or another boot device.
Getting the MMC boot mode in spl_mmc will fail when we are trying to
boot from an MMC device in the spl_boot_list and the original board
boot mode (as returned by spl_boot_device()) is not an MMC boot mode.
Fix it by checking the asked MMC boot device from the spl_mmc_boot_mode()
argument.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'arch/arm/mach-imx/spl.c')
| -rw-r--r-- | arch/arm/mach-imx/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 49bb3b928d..e5835150a0 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -229,7 +229,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device) #ifdef CONFIG_SPL_FORCE_MMC_BOOT switch (boot_device) { #else - switch (spl_boot_device()) { + switch (boot_device) { #endif /* for MMC return either RAW or FAT mode */ case BOOT_DEVICE_MMC1: |