LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Anatolij Gustschin 2020-04-23 13:07:49 +02:00 committed by Stefano Babic
parent ef99f3d9e8
commit a15d0aa680
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-imx/spl.c
View File

@ -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: