I've found an issue in testing with the ENV_IS_IN_X values, they need to be changed from a "select" to an "imply" to enable disabling default values and support booting from MMC and having flash in SPI (or the other way around).
I have the change queued for either a second patch submission (pending additional review and comments), or subsequent patch.
Joel
On 2020-01-11 12:36, Joel Johnson wrote:
With the move to driver model usage, ensure that the required driver support for SPI and MMC booting is available in SPL.
Tested on SolidRun ClearFog devices.
Signed-off-by: Joel Johnson mrjoel@lixil.net
arch/arm/mach-mvebu/Kconfig | 10 ++++++++++ 1 file changed, 10 insertions(+)
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index c6a1a0a944..b3239b2b01 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -234,9 +234,19 @@ choice
config MVEBU_SPL_BOOT_DEVICE_SPI bool "SPI NOR flash"
- select ENV_IS_IN_SPI_FLASH
- select SPL_DM_SPI
- select SPL_MTD_SUPPORT
- select SPL_SPI_FLASH_SUPPORT
- select SPL_SPI_LOAD
- select SPL_SPI_SUPPORT
config MVEBU_SPL_BOOT_DEVICE_MMC bool "SDIO/MMC card"
- select ENV_IS_IN_MMC
- # GPIO required for SD card presence detection line
- select SPL_DM_GPIO
- select SPL_DM_MMC select SPL_LIBDISK_SUPPORT
config MVEBU_SPL_BOOT_DEVICE_SATA