From 0dcf18c69ddcc2a462cd556097d479646c5836ea Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc <alex.g@adaptrum.com> Date: Tue, 4 Apr 2017 10:02:58 -0700 Subject: [PATCH] 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> --- arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +- board/sunxi/Kconfig | 2 ++ common/spl/Kconfig | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig index 499e1ddb22..5ac48ebc4d 100644 --- 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 3e0e262473..a667c9e5c5 100644 --- 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 6752b5c65c..ea6fbb60ad 100644 --- 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 -- 2.39.5