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

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 2b1cdafa9fdd
("common: Pass the boot device into spl_boot_mode()").

This reverts commit 772b55723bcbe8ebe84f579d9cdc831d8e18579d.

Link: https://lists.denx.de/pipermail/u-boot/2020-April/405979.html
Signed-off-by: Harald Seiler <hws@denx.de>

diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index e5835150a06dc5bb6271847251af2002ba03964e..e3f51e45edf29063d24fa43818941b09bfcf6b47 100644 (file)
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -219,18 +219,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
                hang();
        }
 #else
                hang();
        }
 #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 */
        case BOOT_DEVICE_MMC1:
        case BOOT_DEVICE_MMC2:
        /* for MMC return either RAW or FAT mode */
        case BOOT_DEVICE_MMC1:
        case BOOT_DEVICE_MMC2:

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index ef5bf666964f5680ca7982844f896c1a634aa55d..9feadb5e43e7078268086d08af76c0c963422537 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -663,15 +663,6 @@ config SPL_MMC_SUPPORT
          this option to build the drivers in drivers/mmc as part of an SPL
          build.
 
          this option to build the drivers in drivers/mmc as part of an SPL
          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
        bool "Tiny MMC framework in SPL"
        depends on SPL_MMC_SUPPORT
 config SPL_MMC_TINY
        bool "Tiny MMC framework in SPL"
        depends on SPL_MMC_SUPPORT