From: Michal Simek <monstr@monstr.eu>
Date: Mon, 24 Sep 2012 13:22:15 +0000 (+0200)
Subject: zynq: Move MMC config to zynq-common
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=222843743df0c30ae33ef5029db95902cdb583b8;p=thirdparty%2Fu-boot.git

zynq: Move MMC config to zynq-common

Signed-off-by: Michal Simek <monstr@monstr.eu>
---

diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index 86598f3af0f..6f04fe3bb47 100644
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -126,6 +126,16 @@
 #endif
 
 
+#ifdef CONFIG_MMC
+# define CONFIG_GENERIC_MMC
+# define CONFIG_ZYNQ_MMC
+# define CONFIG_CMD_MMC
+# define CONFIG_CMD_FAT
+# define CONFIG_CMD_EXT2
+# define CONFIG_DOS_PARTITION
+#endif
+
+
 /* For development/debugging */
 #ifdef DEBUG
 # define CONFIG_CMD_REGINFO
diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h
index 8382c7ba5e1..306432bde98 100644
--- a/include/configs/zynq_ep107.h
+++ b/include/configs/zynq_ep107.h
@@ -28,6 +28,8 @@
 
 #define CONFIG_CPU_FREQ_HZ	12500000
 
+#define CONFIG_MMC
+
 #include <configs/zynq_common.h>
 
 #undef CONFIG_EXTRA_ENV_SETTINGS
@@ -102,16 +104,4 @@
 #define CONFIG_ZYNQ_XIP_START CONFIG_SYS_FLASH_BASE
 #endif
 
-/* Secure Digital */
-#define CONFIG_MMC
-
-#ifdef CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_ZYNQ_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_DOS_PARTITION
-#endif
-
 #endif /* __CONFIG_ZYNQ_EP107_H */
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index cfeaf286881..437b9ac4320 100644
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -26,6 +26,7 @@
 
 #define CONFIG_SYS_NO_FLASH
 
+#define CONFIG_MMC
 
 #include <configs/zynq_common.h>
 
@@ -43,16 +44,4 @@
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_SPANSION
 
-/* Secure Digital */
-#define CONFIG_MMC
-
-#ifdef CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_ZYNQ_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_DOS_PARTITION
-#endif
-
 #endif /* __CONFIG_ZYNQ_ZC70X_H */
diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 870f4a8c530..8e44bbdeec6 100644
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -26,6 +26,7 @@
 # define CONFIG_ZYNQ_SERIAL_UART1
 # define CONFIG_ZYNQ_GEM0
 # define CONFIG_PHY_ADDR	7
+# define CONFIG_MMC
 
 #elif defined(CONFIG_ZC770_XM011)
 # define CONFIG_ZYNQ_SERIAL_UART1
@@ -45,7 +46,6 @@
 
 
 
-
 #include <configs/zynq_common.h>
 
 #if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM012)
@@ -93,18 +93,5 @@
 #define CONFIG_MTD_DEVICE
 #endif
 
-#if defined(CONFIG_ZC770_XM010)
-/* Secure Digital */
-#define CONFIG_MMC
-
-#ifdef CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_ZYNQ_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_DOS_PARTITION
-#endif
-#endif
 
 #endif /* __CONFIG_ZYNQ_ZC770_H */
diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 533af0dd0e1..b33b2ad2366 100644
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -26,6 +26,8 @@
 
 #define CONFIG_SYS_NO_FLASH
 
+#define CONFIG_MMC
+
 #include <configs/zynq_common.h>
 
 
@@ -62,16 +64,4 @@
 #define CONFIG_CMD_SF
 #define CONFIG_SPI_FLASH_SPANSION
 
-/* Secure Digital */
-#define CONFIG_MMC
-
-#ifdef CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_ZYNQ_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_DOS_PARTITION
-#endif
-
 #endif /* __CONFIG_ZYNQ_ZED_H */