kconfig: mmc: move pxa_mmc_generic to kconfig

Move CONFIG_PXA_MMC_GENERIC to Kconfig.

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
index 153ced7..4d88120 100644 (file)
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -32,6 +32,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x80000
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
+CONFIG_PXA_MMC_GENERIC=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 33b128d..ad86c23 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -299,6 +299,14 @@ config MMC_PCI
 
          If unsure, say N.
 
+config PXA_MMC_GENERIC
+       bool "Support for MMC controllers on PXA"
+       help
+         This selects MMC controllers on PXA.
+         If you are on a PXA architecture, say Y here.
+
+         If unsure, say N.
+
 config MMC_OMAP_HS
        bool "TI OMAP High Speed Multimedia Card Interface support"
        select DM_REGULATOR_PBIAS if DM_MMC && DM_REGULATOR

diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h
index 2632d48..52d77e0 100644 (file)
--- a/include/configs/pxa-common.h
+++ b/include/configs/pxa-common.h
@@ -16,13 +16,6 @@
 #endif
 
 /*
- * MMC Card Configuration
- */
-#ifdef CONFIG_CMD_MMC
-#define        CONFIG_PXA_MMC_GENERIC
-#endif
-
-/*
  * OHCI USB
  */
 #ifdef CONFIG_CMD_USB

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bc3ca6e..7475830 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1368,7 +1368,6 @@ CONFIG_PRPMC_PCI_ALIAS
 CONFIG_PSRAM_SCFG
 CONFIG_PWM
 CONFIG_PXA_LCD
-CONFIG_PXA_MMC_GENERIC
 CONFIG_PXA_PWR_I2C
 CONFIG_PXA_STD_I2C
 CONFIG_PXA_VGA