karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / drivers / mmc / Kconfig

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index b52100c2c51c21c19087b085257fda95752ef9e3..d559e90294976eb2dd73d0469c9e7b9dcfff53bc 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -1,11 +1,20 @@
-menu "MMC Host controller Support"
+menuconfig MMC
+       bool "MMC Host controller Support"
 
-config MMC
-       bool
+if MMC
 
 config GENERIC_MMC
        bool
-       select MMC
+
+config DM_MMC
+       bool "Enable MMC controllers using Driver Model"
+       depends on DM
+       help
+         This enables the MultiMediaCard (MMC) uclass which suports MMC and
+         Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.)
+         and non-removable (e.g. eMMC chip) devices are supported. These
+         appear as block devices in U-Boot and can support filesystems such
+         as EXT4 and FAT.
 
 config SH_SDHI
        bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
@@ -19,11 +28,19 @@ config FSL_ESDHC
 
 config FSL_USDHC
        bool "Support USDHC"
-       depends on MX6Q
-       depends on FSL_ESDHC
+       depends on FSL_ESDHC && SOC_MX6
+
+config MXS_MMC
+       bool "i.MXS MMC/SDHC controller"
+       depends on SOC_MXS || SOC_MX6
+       select GENERIC_MMC
+       select BOUNCE_BUFFER
+
+config OMAP_HSMMC
+       bool "OMAP HSMMC controller"
+       select GENERIC_MMC
 
 config SUPPORT_EMMC_BOOT
        bool "Support boot from eMMC"
-       depends on MMC
 
-endmenu
+endif