summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJoel Johnson <mrjoel@lixil.net>2020-04-17 01:19:05 -0600
committerStefan Roese <sr@denx.de>2020-04-22 14:28:15 +0200
commitab2f757eb0513118ac16cab488ea1257ab7d9b83 (patch)
tree495d73b6ab71bc9a93572e827c92bdebbb31c0ee /arch
parent36d61a3d0ae6d5ad0838a5ccb427df12102d02ad (diff)
arm: mvebu: correct SPL boot configs for SPI/MMC
Update mvebu SPL boot selection mechanism for the move to driver model usage by ensuring that the required driver support for SPI and MMC booting is available in SPL when the respective boot method is selected. Previously, all mvebu boards selected a boot method (implicitly MVEBU_SPL_BOOT_DEVICE_SPI for many) even if SPL booting wasn't used. This changes mvebu boot method selection to depend on SPL usage which resolves the issue with aarch64 boards which don't use SPL getting an implicit boot device selection resulting in unmet dependencies. The 32-bit arm boards do use SPL, but I'm led to conclude that most aren't intentionally using the MVEBU_SPL_BOOT_DEVICE selection since none have SPL_DM_SPI enabled in their defconfig even though they still implicitly select the SPI boot method. This also results in the new addition of SPL_GPIO_SUPPORT to helios4. The mainline dts for helios4 includes the cd-gpios entry for sdhci with identical addresses as the clearfog dts. I don't have a helios4 board to confirm, but based on the current source conclude that the board itself is either wired to pull the signal low for eMMC, or the default MMC boot isn't fully functional in mainline. In either case, as far as I can tell, including the GPIO support will at least cause no regression. Tested on SolidRun ClearFog devices. Signed-off-by: Joel Johnson <mrjoel@lixil.net> Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mvebu/Kconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 161dee937f..645990b3ef 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -232,13 +232,25 @@ config SYS_SOC
choice
prompt "Boot method"
+ depends on SPL
config MVEBU_SPL_BOOT_DEVICE_SPI
bool "SPI NOR flash"
+ imply ENV_IS_IN_SPI_FLASH
+ select SPL_DM_SPI
+ select SPL_SPI_FLASH_SUPPORT
+ select SPL_SPI_LOAD
+ select SPL_SPI_SUPPORT
config MVEBU_SPL_BOOT_DEVICE_MMC
bool "SDIO/MMC card"
+ imply ENV_IS_IN_MMC
+ # GPIO needed for eMMC/SD card presence detection
+ select SPL_DM_GPIO
+ select SPL_DM_MMC
+ select SPL_GPIO_SUPPORT
select SPL_LIBDISK_SUPPORT
+ select SPL_MMC_SUPPORT
config MVEBU_SPL_BOOT_DEVICE_SATA
bool "SATA"