Browse Source

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>
Alexandru Gagniuc 8 years ago
parent
commit
0dcf18c69d
3 changed files with 4 additions and 2 deletions
  1. 1 1
      arch/arm/cpu/armv8/zynqmp/Kconfig
  2. 2 0
      board/sunxi/Kconfig
  3. 1 1
      common/spl/Kconfig

+ 1 - 1
arch/arm/cpu/armv8/zynqmp/Kconfig

@@ -13,7 +13,7 @@ config SPL_LIBGENERIC_SUPPORT
 	default y
 	default y
 
 
 config SPL_MMC_SUPPORT
 config SPL_MMC_SUPPORT
-	default y
+	default y if MMC_SDHCI_ZYNQ
 
 
 config SPL_SERIAL_SUPPORT
 config SPL_SERIAL_SUPPORT
 	default y
 	default y

+ 2 - 0
board/sunxi/Kconfig

@@ -3,6 +3,7 @@ if ARCH_SUNXI
 config IDENT_STRING
 config IDENT_STRING
 	default " Allwinner Technology"
 	default " Allwinner Technology"
 
 
+# FIXME: Should not redefine these Kconfig symbols
 config PRE_CONSOLE_BUFFER
 config PRE_CONSOLE_BUFFER
 	default y
 	default y
 
 
@@ -19,6 +20,7 @@ config SPL_LIBGENERIC_SUPPORT
 	default y
 	default y
 
 
 config SPL_MMC_SUPPORT
 config SPL_MMC_SUPPORT
+	depends on SPL && GENERIC_MMC
 	default y
 	default y
 
 
 config SPL_POWER_SUPPORT
 config SPL_POWER_SUPPORT

+ 1 - 1
common/spl/Kconfig

@@ -371,7 +371,7 @@ config SPL_LIBGENERIC_SUPPORT
 
 
 config SPL_MMC_SUPPORT
 config SPL_MMC_SUPPORT
 	bool "Support MMC"
 	bool "Support MMC"
-	depends on SPL
+	depends on SPL && GENERIC_MMC
 	help
 	help
 	  Enable support for MMC (Multimedia Card) within SPL. This enables
 	  Enable support for MMC (Multimedia Card) within SPL. This enables
 	  the MMC protocol implementation and allows any enabled drivers to
 	  the MMC protocol implementation and allows any enabled drivers to