aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2012-08-27 11:08:30 -0600
committerJohn Rigby <john.rigby@linaro.org>2012-08-27 11:08:30 -0600
commit71e367234006f842de3a8e2c2e9848d3b9bc6c1a (patch)
tree5c12b269c08442b9e299378d49d7d7f884fff61e
parent2f6410a71ca6c78755d29f2ac22c4b7617e315ea (diff)
downloadu-boot-linaro-stable-71e367234006f842de3a8e2c2e9848d3b9bc6c1a.tar.gz
Revert "ARM: SAMSUNG: support sdhci controller"
This reverts commit 7d2d58b4e63a8307f713e6b17fdb9b2413548574.
-rw-r--r--include/configs/origen.h7
-rw-r--r--include/configs/s5p_goni.h7
-rw-r--r--include/configs/s5pc210_universal.h7
-rw-r--r--include/configs/smdk5250.h3
-rw-r--r--include/configs/smdkv310.h7
-rw-r--r--include/configs/trats.h3
6 files changed, 14 insertions, 20 deletions
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 1f143618f..48425d580 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -69,10 +69,9 @@
#define EXYNOS4_DEFAULT_UART_OFFSET 0x020000
/* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
+#define CONFIG_GENERIC_MMC 1
+#define CONFIG_MMC 1
+#define CONFIG_S5P_MMC 1
/* PWM */
#define CONFIG_PWM 1
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 16be76457..cbaffb1e7 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -63,10 +63,9 @@
#define CONFIG_BAUDRATE 115200
/* MMC */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
+#define CONFIG_GENERIC_MMC 1
+#define CONFIG_MMC 1
+#define CONFIG_S5P_MMC 1
/* PWM */
#define CONFIG_PWM 1
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 721301f95..a332f2801 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -66,10 +66,9 @@
#define CONFIG_BAUDRATE 115200
/* MMC */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
+#define CONFIG_GENERIC_MMC 1
+#define CONFIG_MMC 1
+#define CONFIG_S5P_MMC 1
/* PWM */
#define CONFIG_PWM 1
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index d47881bcb..d612d26c2 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -78,8 +78,7 @@
/* SD/MMC configuration */
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
+#define CONFIG_S5P_MMC
#define CONFIG_BOARD_EARLY_INIT_F
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 41d7780a0..a539826ce 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -68,10 +68,9 @@
#define EXYNOS4_DEFAULT_UART_OFFSET 0x010000
/* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
+#define CONFIG_GENERIC_MMC 1
+#define CONFIG_MMC 1
+#define CONFIG_S5P_MMC 1
/* PWM */
#define CONFIG_PWM 1
diff --git a/include/configs/trats.h b/include/configs/trats.h
index d2dfc9ff2..eb269b277 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -74,8 +74,7 @@
/* MMC */
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC
-#define CONFIG_S5P_SDHCI
-#define CONFIG_SDHCI
+#define CONFIG_S5P_MMC
/* PWM */
#define CONFIG_PWM