On 17.04.20 09:19, Joel Johnson wrote:
Change the SPL boot selection of MMC from a hard selection of GPIO to a softer imply and opt-out of GPIO support for helios4. This preserves the previous GPIO-less configuration.
Signed-off-by: Joel Johnson mrjoel@lixil.net
Doesn't patch 1/2 generate a compile error (at least warning) on helios4? If yes, then please squash both patches together to preserve git bisect-ablility.
Thanks, Stefan
Aditya Prayoga - if you object to the addition of GPIO to the helios4 SPL, I'd be interested in your thoughts on this option
This is an exploratory commit of a viable approach to retain the identical current helios4 current configuration. I think it's not worth it and shouldn't be applied since helios4 uses default MMC boot and there is sufficient space for the SPL image, but is a viable option depending on the opinion of helios4 interested maintainers.
arch/arm/mach-mvebu/Kconfig | 6 +++--- configs/helios4_defconfig | 1 + 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 645990b3ef..af30d71cc6 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -245,12 +245,12 @@ config MVEBU_SPL_BOOT_DEVICE_SPI 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
# GPIO often needed for eMMC/SD card presence detection
imply SPL_DM_GPIO
imply SPL_GPIO_SUPPORT
config MVEBU_SPL_BOOT_DEVICE_SATA bool "SATA"
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig index 0fe8559507..3630a004bd 100644 --- a/configs/helios4_defconfig +++ b/configs/helios4_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_TEXT_BASE=0x00800000 +# CONFIG_SPL_GPIO_SUPPORT is not set CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000
Viele Grüße, Stefan