aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2011-07-28 02:06:52 -0300
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 09:00:20 -0600
commitd547629c56c137ba9a8b137b1e322b0a461c6319 (patch)
treed9aacffeecedfa9c4c541fb321ce9ba019b6c24f
parentc2eb43f2661714b0a952942a45f2cd6a9c8bc558 (diff)
downloadlinux-linaro-d547629c56c137ba9a8b137b1e322b0a461c6319.tar.gz
LINARO: CONFIG: MMC_SDHCI=y for MX51
Buglink: https://bugs.launchpad.net/bugs/817317 Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-mx515
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-omap2
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-s5pv3101
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-u85002
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-vexpress2
-rw-r--r--debian.linaro/config/config.common.ubuntu4
6 files changed, 9 insertions, 7 deletions
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index c6553f93b9e..fd3e03648f7 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -145,8 +145,8 @@ CONFIG_MII=m
# CONFIG_MISC_DEVICES is not set
CONFIG_MISC_FILESYSTEMS=y
CONFIG_MMC=y
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
# CONFIG_MMC_UNSAFE_RESUME is not set
# CONFIG_MODULE_FORCE_LOAD is not set
# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -258,7 +258,6 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_W1 is not set
# CONFIG_WATCHDOG is not set
# CONFIG_WIRELESS is not set
-# CONFIG_WL12XX_MENU is not set
# CONFIG_WLAN is not set
# CONFIG_XFRM_MIGRATE is not set
# CONFIG_XFRM_USER is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 508e7cc156e..4294fb5f502 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -181,8 +181,8 @@ CONFIG_MII=y
# CONFIG_MISC_DEVICES is not set
CONFIG_MISC_FILESYSTEMS=y
CONFIG_MMC=y
-CONFIG_MMC_BLOCK=y
# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_PLTFM is not set
CONFIG_MMC_UNSAFE_RESUME=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index fc4e73dba6a..49a56d845a5 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -130,6 +130,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
# CONFIG_MISC_DEVICES is not set
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_MMC is not set
+# CONFIG_MMC_SDHCI_PLTFM is not set
# CONFIG_MODULE_FORCE_LOAD is not set
# CONFIG_MODULE_FORCE_UNLOAD is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index 1c29f0ff1cf..ddbfbb6b4cc 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -137,8 +137,8 @@ CONFIG_MFD_TC3589X=y
CONFIG_MISC_DEVICES=y
# CONFIG_MISC_FILESYSTEMS is not set
CONFIG_MMC=y
-CONFIG_MMC_BLOCK=y
# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_PLTFM is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
# CONFIG_MODULE_FORCE_LOAD is not set
# CONFIG_MODULE_FORCE_UNLOAD is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 392fbc904bd..1b4a1267c6e 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -167,8 +167,8 @@ CONFIG_MII=y
CONFIG_MISC_DEVICES=y
CONFIG_MISC_FILESYSTEMS=y
CONFIG_MMC=y
-CONFIG_MMC_BLOCK=y
# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_PLTFM is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
# CONFIG_MODULE_FORCE_LOAD is not set
# CONFIG_MODULE_FORCE_UNLOAD is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 530be0bf97e..80f559aded8 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -1027,6 +1027,7 @@ CONFIG_MFD_OMAP_USB_HOST=y
# CONFIG_MINIX_FS is not set
# CONFIG_MINIX_SUBPARTITION is not set
CONFIG_MMC_ARMMMCI=y
+CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_BOUNCE=y
CONFIG_MMC_BLOCK_MINORS=8
# CONFIG_MMC_CLKGATE is not set
@@ -1034,8 +1035,9 @@ CONFIG_MMC_BLOCK_MINORS=8
# CONFIG_MMC_DW is not set
CONFIG_MMC_OMAP=y
CONFIG_MMC_OMAP_HS=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=y
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
# CONFIG_MMC_SDHCI_OF is not set
-# CONFIG_MMC_SDHCI_PLTFM is not set
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_TEST is not set
# CONFIG_MMC_USHC is not set