arm: socfpga: imply SPL options instead of select

For a small SPL, it should be possible to build without SPI(-flash) drivers
or wihout MMC drivers.

For this to work, we have to change from 'select'ing options to 'imply'ing
them.

With this change, I can have SPL trimmed to my hard-wired starting method
(SPI-NOR or MMC) while still including all drivers in U-Boot.

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 13ba774..bec46ce 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -817,15 +817,11 @@ config ARCH_SOCFPGA
        select SPL_DM_RESET if DM_RESET
        select SPL_DM_SERIAL
        select SPL_LIBCOMMON_SUPPORT
-       select SPL_LIBDISK_SUPPORT
        select SPL_LIBGENERIC_SUPPORT
-       select SPL_MMC_SUPPORT if DM_MMC
        select SPL_NAND_SUPPORT if SPL_NAND_DENALI
        select SPL_OF_CONTROL
        select SPL_SEPARATE_BSS if TARGET_SOCFPGA_STRATIX10
        select SPL_SERIAL_SUPPORT
-       select SPL_SPI_FLASH_SUPPORT if SPL_SPI_SUPPORT
-       select SPL_SPI_SUPPORT if DM_SPI
        select SPL_WATCHDOG_SUPPORT
        select SUPPORT_SPL
        select SYS_NS16550
@@ -836,8 +832,12 @@ config ARCH_SOCFPGA
        imply DM_SPI
        imply DM_SPI_FLASH
        imply FAT_WRITE
+       imply SPL_LIBDISK_SUPPORT
+       imply SPL_MMC_SUPPORT
        imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
        imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
+       imply SPL_SPI_FLASH_SUPPORT
+       imply SPL_SPI_SUPPORT
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"