imx6: generic MMC config options to mx6_common

Move all standard mx6 MMC configs to mx6_common.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Tom Rini <trini at konsulko.com>

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index d84a9084267a20644133ba8dc0383dcf1c5c7764..d44624d68b04e4c9b6a0da1b31da1ee3d50ffcd2 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -30,15 +30,8 @@
 #define CONFIG_MXC_OCOTP
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 3d6010e8f007f02e0ea8e5d6342fe89c1868585b..d655baaeeb8dc7cbc52bc5dd4f103ec18d313363 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -27,15 +27,8 @@
 #define CONFIG_MXC_UART_BASE          UART2_BASE
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 /* Miscellaneous commands */
 #define CONFIG_CMD_BMODE
 

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 663e04bae022b700d395d53bafeccc424ccb3562..a3908d0ef514d029bbafc2732d5f0a1911346577 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -25,11 +25,6 @@
 #undef CONFIG_CMD_FPGA
 
 /* MMC */
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
 

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index f28548bbe93bca785a934073a0eafc8630cc611c..23df69faa8dad4ac9880bdd7f3c4fe6ee425ca36 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -13,8 +13,6 @@
 #ifndef __RIOTBOARD_CONFIG_H
 #define __RIOTBOARD_CONFIG_H
 
-#include "mx6_common.h"
-
 #define CONFIG_MXC_UART_BASE           UART2_BASE
 #define CONFIG_CONSOLE_DEV             "ttymxc1"
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"
@@ -56,15 +54,8 @@
 #define CONFIG_MXC_USB_FLAGS   0
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 #define CONFIG_FEC_MXC
 #define CONFIG_MII
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
@@ -160,5 +151,6 @@
 #define CONFIG_IMX_VIDEO_SKIP
 
 #include <config_distro_defaults.h>
+#include "mx6_common.h"
 
 #endif                         /* __RIOTBOARD_CONFIG_H */

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 1b4078c48038da98580d22dd4fea8b50d6315b16..42880960fb70a500026ca3c3cc4a1b4f3ec4b23f 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -117,14 +117,8 @@
 #define CONFIG_I2C_EDID
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       1
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
 
 /* Filesystem support */
 #define CONFIG_CMD_UBIFS

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 43c1d46290b75955e6fe530376ea7c209595159c..626af41be369c933573c8c05fabbf15a3f28b428 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -95,4 +95,12 @@
 #define CONFIG_MXC_GPIO
 #define CONFIG_CMD_GPIO
 
+/* MMC */
+#define CONFIG_MMC
+#define CONFIG_CMD_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_BOUNCE_BUFFER
+#define CONFIG_FSL_ESDHC
+#define CONFIG_FSL_USDHC
+
 #endif

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 60c3ac9a313c296fe0cc0b44141671758b1d07a5..3c0affe1e346318b130117607d7f776c7466d963 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -24,13 +24,7 @@
 #define CONFIG_MXC_OCOTP
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
 
 /* Ethernet Configuration */
 #define CONFIG_FEC_MXC

diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 33836bc797128f1ec0846557d98c23cdd8c49377..4c7376f191e520f41e055624963b3365c0919814 100644 (file)
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -20,16 +20,9 @@
 #define CONFIG_MXC_UART_BASE           UART4_BASE
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC4_BASE_ADDR
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 9734c60ae03f97d9e4ad267187b791c2f31efe62..961a3a5685b810b2e8c181fdbb87dad616352786 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -27,15 +27,8 @@
 #endif
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 14eaf54dcfe31faa3df7b545622090f47ea9ac71..455e4b03da5baf7db8e327e7dc562a6631c32ad1 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -23,14 +23,8 @@
 #define CONFIG_MXC_UART_BASE           UART1_IPS_BASE_ADDR
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-
 /* I2C Configs */
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 1c851adad6aa2ccd4bb39a4e9135fd825815e339..d39f954ab251c978793785bd59ee1919c256adc5 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -121,15 +121,8 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* MMC Configuration */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC4_BASE_ADDR
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 /* I2C Configs */
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 9fd6704492e7666e30d25c764f6e0e1b335a7b32..121cbefd44cab5091599f41fb6e09d5d3a551ccc 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -54,16 +54,10 @@
 #define CONFIG_I2C_EDID
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
+#ifdef CONFIG_SOC_MX6Q
 #define CONFIG_CMD_SATA
 #endif
 

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 20a077d6608f936c28d4ccec50b63a6c29681eb7..b6e852167a60487307558cff06abf36abc6b2903 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -27,7 +27,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_FUSE
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_MMC
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
@@ -118,15 +117,8 @@
 #endif
 
 /* MMC Configs */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
-#endif
 
 /* OCOTP Configs */
 #ifdef CONFIG_CMD_FUSE

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 0e930e247e5d4e01540e62bfe48fc3f33bf52355..3d9b04f7b550e6da99856a6e1607d2353572a5f8 100644 (file)
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -61,16 +61,9 @@
 #define IMX_OTPWRITE_ENABLED
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 /* USB Configs */
 #define CONFIG_CMD_USB
 #define CONFIG_USB_STORAGE

diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index b8ba9f989ffb12764bb92df14942be21ec79e94f..6d3bbc28d3db6a6b86b4d76b37eb1f6dca9ca8d2 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -26,7 +26,6 @@
 #define CONFIG_CMD_FUSE
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_MMC
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_NAND_TRIMFFS
@@ -52,13 +51,8 @@
 #define CONFIG_SYS_I2C_SPEED                   100000
 
 /* MMC config */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR              0
 #define CONFIG_SYS_FSL_USDHC_NUM               1
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
 
 /* Ethernet config */
 #define CONFIG_FEC_MXC

diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index c5d606e9097d3e7becd588f642b0a7ac6d7659f9..7b28671e182a4bf08c686b012f52aa733daaa669 100644 (file)
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -29,16 +29,9 @@
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
 
 /* MMC Configuration */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_USDHC_NUM        2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 /* Ethernet Configuration */
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 01cd0f650ce748bd81b426a93211fbc664c17f21..5e04fa01f4e9322e52a4b4a1d23a63ff92d4c443 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -60,16 +60,9 @@
 #define CONFIG_FIT
 
 /* MMC */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC4_BASE_ADDR
-
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_BOUNCE_BUFFER
 
 /* Ethernet */
 #define CONFIG_FEC_MXC

diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 977e38d02185e22f1099f51c0ad3ac6d5ed660f9..3fe5abd7160f9f570c6da2e5bd552c7b7a62b802 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -35,16 +35,9 @@
 #define CONFIG_SYS_I2C_SPEED           100000
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       1
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 6d2deb05f00814c3fbd610482ef081adf0012ffa..c5a404af8d4c149d9bf11f35c9d08a2418e95db9 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -78,15 +78,8 @@
 #define TQMA6_PFUZE100_I2C_BUS         2
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 /* USB Configs */
 #define CONFIG_CMD_USB
 #define CONFIG_USB_EHCI

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 7c18d247554229b3924178a657e9c082000cff76..84c36069c93c84a8f67e1eefe432377544a22a83 100644 (file)
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -58,15 +58,8 @@
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
 
 /* MMC Configuration */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 #define CONFIG_DEFAULT_FDT_FILE                "imx6q-udoo.dtb"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 507722a3108cad0a982eaad0413b6fa024e36126..d827e3bef213878d94827b0e06850709ce9de8c0 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -42,16 +42,9 @@
 #define CONFIG_SYS_I2C_SPEED           100000
 
 /* MMC Configuration */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 /* USB Configs */
 #define CONFIG_CMD_USB
 #define CONFIG_USB_EHCI

diff --git a/include/configs/warp.h b/include/configs/warp.h
index 7ed2d1cac60170b8f7cbad75681cb61af65eb004..3b3bc2a7a5622f7abfa51ea2f54960951a5d8965 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -25,17 +25,10 @@
 #define CONFIG_MXC_UART_BASE           UART1_IPS_BASE_ADDR
 
 /* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
 
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-
 /* Command definition */
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS