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

[u-boot] / drivers / mmc / Kconfig

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 6935da2177dcf7cc8e147845fc71a44252c9b70b..377b1c4b3b0ac35a8a9da9d6619c027b5faf0a09 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -71,6 +71,13 @@ config MMC_HW_PARTITIONING
          This adds a command and an API to do hardware partitioning on eMMC
          devices.
 
+config SUPPORT_EMMC_RPMB
+       bool "Support eMMC replay protected memory block (RPMB)"
+       imply CMD_MMC_RPMB
+       help
+         Enable support for reading, writing and programming the
+         key for the Replay Protection Memory Block partition in eMMC.
+
 config MMC_IO_VOLTAGE
        bool "Support IO voltage configuration"
        help
@@ -124,6 +131,14 @@ config MMC_VERBOSE
          Enable the output of more information about the card such as the
          operating mode.
 
+config MMC_TRACE
+       bool "MMC debugging"
+       default n
+       help
+         This is an option for use by developer. Enable MMC core debugging.
+
+         If you need to see the MMC core message, say Y.
+
 config SPL_MMC_TINY
        bool "Tiny MMC framework in SPL"
        help
@@ -266,6 +281,12 @@ config SH_SDHI
        help
          Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform
 
+config SH_MMCIF
+       bool "SuperH/Renesas ARM SoCs on-chip MMCIF host controller support"
+       depends on ARCH_RMOBILE || SH
+       help
+         Support for the on-chip MMCIF host controller on SuperH/Renesas ARM SoCs platform
+
 config MMC_UNIPHIER
        bool "UniPhier SD/MMC Host Controller support"
        depends on ARCH_UNIPHIER
@@ -358,6 +379,17 @@ config MMC_SDHCI_BCM2835
 
          If unsure, say N.
 
+config MMC_SDHCI_BCMSTB
+       tristate "SDHCI support for the BCMSTB SD/MMC Controller"
+       depends on MMC_SDHCI
+       help
+         This selects the Broadcom set-top box SD/MMC controller.
+
+         If you have a BCMSTB platform with SD or MMC devices,
+         say Y here.
+
+         If unsure, say N.
+
 config MMC_SDHCI_CADENCE
        bool "SDHCI support for the Cadence SD/SDIO/eMMC controller"
        depends on BLK && DM_MMC