diff mbox

[U-Boot] spl: Kconfig: SPL_MMC_SUPPORT depends on GENERIC_MMC

Message ID 20170404170258.27141-1-alex.g@adaptrum.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Alexandru Gagniuc April 4, 2017, 5:02 p.m. UTC
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>
---
Changes since v1:
 * Applied same dependency logic to sunxi Kconfig file

 board/sunxi/Kconfig | 2 ++
 common/spl/Kconfig  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Tom Rini April 9, 2017, 1:15 a.m. UTC | #1
On Tue, Apr 04, 2017 at 10:02:58AM -0700, Alexandru Gagniuc wrote:

> 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>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 37b4252..bc01930 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 6752b5c..ea6fbb6 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