Move CONFIG_PXA_MMC_GENERIC to Kconfig.
Signed-off-by: Marcel Ziswiler marcel@ziswiler.com
---
configs/colibri_pxa270_defconfig | 1 + configs/zipitz2_defconfig | 1 + drivers/mmc/Kconfig | 8 ++++++++ include/configs/pxa-common.h | 7 ------- include/configs/zipitz2.h | 8 -------- scripts/config_whitelist.txt | 1 - 6 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig index 492ee9eaaf..a3c07d5887 100644 --- a/configs/colibri_pxa270_defconfig +++ b/configs/colibri_pxa270_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_FLASH=y 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/configs/zipitz2_defconfig b/configs/zipitz2_defconfig index 509adcffd9..9590d16593 100644 --- a/configs/zipitz2_defconfig +++ b/configs/zipitz2_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="$ " CONFIG_CMD_MMC=y +CONFIG_PXA_MMC_GENERIC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index c23299ea96..d89140e520 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -274,6 +274,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 e25800a095..ba315b3fb8 100644 --- a/include/configs/pxa-common.h +++ b/include/configs/pxa-common.h @@ -17,13 +17,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 #endif
-/* - * MMC Card Configuration - */ -#ifdef CONFIG_CMD_MMC -#define CONFIG_PXA_MMC_GENERIC -#endif - /* * OHCI USB */ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 24fea68a11..cf8f6ff671 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -47,14 +47,6 @@ * Bootloader Components Configuration */
-/* - * MMC Card Configuration - */ -#ifdef CONFIG_CMD_MMC -#define CONFIG_PXA_MMC_GENERIC -#define CONFIG_SYS_MMC_BASE 0xF0000000 -#endif - /* * SPI and LCD */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b16bc6ae34..511287ada0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1533,7 +1533,6 @@ CONFIG_PSRAM_SCFG CONFIG_PWM CONFIG_PWM_IMX CONFIG_PXA_LCD -CONFIG_PXA_MMC_GENERIC CONFIG_PXA_PWR_I2C CONFIG_PXA_STD_I2C CONFIG_PXA_VGA