Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / drivers / mmc / Kconfig

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 2fcdaddf22e5bbb81269acc242b8c3d9d19bca3a..88a13591adf330f5f7db38e1ed59a5447c551289 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -3,6 +3,7 @@ menu "MMC Host controller Support"
 config MMC
        bool "MMC/SD/SDIO card support"
        default ARM || PPC || SANDBOX
+       select HAVE_BLOCK_DEVICE
        help
          This selects MultiMediaCard, Secure Digital and Secure
          Digital I/O support.
@@ -10,6 +11,18 @@ config MMC
          If you want MMC/SD/SDIO support, you should say Y here and
          also to your specific host controller driver.
 
+config MMC_WRITE
+       bool "support for MMC/SD write operations"
+       depends on MMC
+       default y
+       help
+         Enable write access to MMC and SD Cards
+
+config MMC_BROKEN_CD
+       bool "Poll for broken card detection case"
+       help
+         If card  detection feature is broken, just poll to detect.
+
 config DM_MMC
        bool "Enable MMC controllers using Driver Model"
        depends on DM
@@ -51,6 +64,13 @@ config MMC_QUIRKS
          are enabled by default, other may require additionnal flags or are
          enabled by the host driver.
 
+config MMC_HW_PARTITIONING
+       bool "Support for HW partitioning command(eMMC)"
+       default y
+       help
+         This adds a command and an API to do hardware partitioning on eMMC
+         devices.
+
 config MMC_IO_VOLTAGE
        bool "Support IO voltage configuration"
        help
@@ -190,6 +210,10 @@ config MMC_MXC
 
 config MMC_MXS
        bool "Freescale MXS Multimedia Card Interface support"
+       depends on MX23 || MX28 || MX6 || MX7
+       select APBH_DMA
+       select APBH_DMA_BURST if ARCH_MX6 || ARCH_MX7
+       select APBH_DMA_BURST8 if ARCH_MX6 || ARCH_MX7
        help
          This selects the Freescale SSP MMC controller found on MXS based
          platforms like mx23/28.
@@ -215,6 +239,15 @@ config MMC_OMAP_HS
 
          If unsure, say N.
 
+config MMC_OMAP_HS_ADMA
+       bool "ADMA support for OMAP HS MMC"
+       depends on MMC_OMAP_HS && !OMAP34XX
+       default y if !AM33XX
+       help
+         This enables support for the ADMA2 controller (SDA3.00 Part A2 DMA
+         controller). If supported by the hardware, selecting this option will
+         increase performances.
+
 config MMC_OMAP36XX_PINS
        bool "Enable MMC1 on OMAP36xx/37xx"
        depends on OMAP34XX && MMC_OMAP_HS
@@ -242,6 +275,20 @@ config MMC_UNIPHIER
          This selects support for the Matsushita SD/MMC Host Controller on
          SocioNext UniPhier and Renesas RCar SoCs.
 
+config MMC_BCM2835
+       bool "BCM2835 family custom SD/MMC Host Controller support"
+       depends on ARCH_BCM283X
+       depends on BLK && DM_MMC
+       depends on OF_CONTROL
+       default y
+       help
+         This selects support for the custom SD host controller in the BCM2835
+         family of devices.
+
+         If you have a BCM2835 platform with SD or MMC devices, say Y here.
+
+         If unsure, say N.
+
 config MMC_SANDBOX
        bool "Sandbox MMC support"
        depends on SANDBOX