spl: Kconfig: SPL_MMC_SUPPORT depends on GENERIC_MMC

spl_mmc.c calls mmc_initialize(). This symbol is provided in
drivers/mmc/mmc.c when CONFIG_GENERIC_MMC is enabled.
The sunxi Kconfig case is an oddball because it redefines
SPL_MMC_SUPPORT.

Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com>
[trini: Update arch/arm/cpu/armv8/zynqmp/Kconfig]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
index 499e1ddb224b9c766b80e4042401ccde24e18e05..5ac48ebc4d1aa904b4af16a00844106fa1ab6293 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/Kconfig
+++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
@@ -13,7 +13,7 @@ config SPL_LIBGENERIC_SUPPORT
        default y
 
 config SPL_MMC_SUPPORT
-       default y
+       default y if MMC_SDHCI_ZYNQ
 
 config SPL_SERIAL_SUPPORT
        default y

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 3e0e2624737e9e34322655a10c76ce0bb61d80e4..a667c9e5c5c115dd7c33a95678888751195ecf0e 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -3,6 +3,7 @@ if ARCH_SUNXI
 config IDENT_STRING
        default " Allwinner Technology"
 
+# FIXME: Should not redefine these Kconfig symbols
 config PRE_CONSOLE_BUFFER
        default y
 
@@ -19,6 +20,7 @@ config SPL_LIBGENERIC_SUPPORT
        default y
 
 config SPL_MMC_SUPPORT
+       depends on SPL && GENERIC_MMC
        default y
 
 config SPL_POWER_SUPPORT

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 6752b5c65cccd806745959e8be91166148744673..ea6fbb60adf792269b0a383fa72969c003c41c57 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -371,7 +371,7 @@ config SPL_LIBGENERIC_SUPPORT
 
 config SPL_MMC_SUPPORT
        bool "Support MMC"
-       depends on SPL
+       depends on SPL && GENERIC_MMC
        help
          Enable support for MMC (Multimedia Card) within SPL. This enables
          the MMC protocol implementation and allows any enabled drivers to