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

Revert "imx: Introduce CONFIG_SPL_FORCE_MMC_BOOT to force MMC boot on falcon mode"

Browse Source 
The CONFIG_SPL_FORCE_MMC_BOOT config flag is not needed as its behavior
is the correct one in all cases;  using spl_boot_device() instead of the
boot_device parameter will lead to inconsistency issues, for example,
when a board_boot_order() is defined.  In fact, this is the reason the
parameter was introduced in the first place, in commit 2b1cdafa9f
("common: Pass the boot device into spl_boot_mode()").

This reverts commit 772b55723b.

Link: https://lists.denx.de/pipermail/u-boot/2020-April/405979.html
Signed-off-by: Harald Seiler <hws@denx.de>
This commit is contained in:
Harald Seiler 2020-04-23 13:07:50 +02:00 committed by Stefano Babic
parent a15d0aa680
commit 15aec318ef
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,18 +219,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
hang(); hang();
} }
#else #else
/*
* When CONFIG_SPL_FORCE_MMC_BOOT is defined the 'boot_device' is used
* unconditionally to decide about device to use for booting.
* This is crucial for falcon boot mode, when board boots up (i.e. ROM
* loads SPL) from slow SPI-NOR memory and afterwards the SPL's 'falcon' boot
* mode is used to load Linux OS from eMMC partition.
*/
#ifdef CONFIG_SPL_FORCE_MMC_BOOT
switch (boot_device) { switch (boot_device) {
#else
switch (boot_device) {
#endif
/* for MMC return either RAW or FAT mode */ /* for MMC return either RAW or FAT mode */
case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2:

9
common/spl/Kconfig
View File

@ -663,15 +663,6 @@ config SPL_MMC_SUPPORT
this option to build the drivers in drivers/mmc as part of an SPL this option to build the drivers in drivers/mmc as part of an SPL
build. build.
config SPL_FORCE_MMC_BOOT
bool "Force SPL booting from MMC"
depends on SPL_MMC_SUPPORT
default n
help
Force SPL to use MMC device for Linux kernel booting even when the
SoC ROM recognized boot medium is not eMMC/SD. This is crucial for
factory or 'falcon mode' booting.
config SPL_MMC_TINY config SPL_MMC_TINY
bool "Tiny MMC framework in SPL" bool "Tiny MMC framework in SPL"
depends on SPL_MMC_SUPPORT depends on SPL_MMC_SUPPORT