| Message ID | 20200423110753.51231-3-hws@denx.de |
|---|---|
| State | Accepted |
| Commit | 15aec318ef03037a6e988f6f015629f7fb2cb368 |
| Headers | show |
| Series | Fix spl_mmc_boot_mode() implementation for IMX | expand |
> 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 at denx.de> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index e5835150a06d..e3f51e45edf2 100644 --- 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 -/* - * 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) { -#else - switch (boot_device) { -#endif /* 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 9d52b75cb434..344fb8003f63 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -669,15 +669,6 @@ config SPL_MMC_SUPPORT 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
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 at denx.de> --- arch/arm/mach-imx/spl.c | 11 ----------- common/spl/Kconfig | 9 --------- 2 files changed, 20 deletions(-)