diff mbox

[U-Boot,09/10] imx6: generic MMC config options to mx6_common

Message ID 1431343409-4707-10-git-send-email-pbrobinson@gmail.com
State Deferred
Delegated to: Tom Rini
Headers show

Commit Message

Peter Robinson May 11, 2015, 11:23 a.m. UTC 
Move all standard mx6 MMC configs to mx6_common.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>

---
 include/configs/aristainetos.h    | 7 -------
 include/configs/cgtqmx6eval.h     | 7 -------
 include/configs/cm_fx6.h          | 5 -----
 include/configs/embestmx6boards.h | 7 -------
 include/configs/gw_ventana.h      | 6 ------
 include/configs/hummingboard.h    | 7 -------
 include/configs/mx6_common.h      | 8 ++++++++
 include/configs/mx6cuboxi.h       | 6 ------
 include/configs/mx6qarm2.h        | 7 -------
 include/configs/mx6sabre_common.h | 7 -------
 include/configs/mx6slevk.h        | 6 ------
 include/configs/mx6sxsabresd.h    | 7 -------
 include/configs/nitrogen6x.h      | 7 -------
 include/configs/novena.h          | 8 --------
 include/configs/ot1200.h          | 7 -------
 include/configs/platinum.h        | 6 ------
 include/configs/secomx6quq7.h     | 7 -------
 include/configs/tbs2910.h         | 7 -------
 include/configs/titanium.h        | 7 -------
 include/configs/tqma6.h           | 7 -------
 include/configs/udoo.h            | 7 -------
 include/configs/wandboard.h       | 7 -------
 include/configs/warp.h            | 7 -------
 23 files changed, 8 insertions(+), 149 deletions(-)

Comments

Tom Rini May 11, 2015, 12:43 p.m. UTC | #1 
On Mon, May 11, 2015 at 12:23:28PM +0100, Peter Robinson wrote:

> Move all standard mx6 MMC configs to mx6_common.
> 
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> 

Reviewed-by: Tom Rini <trini@konsulko.com>
diff mbox

Patch

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index 64b764b..7a82af9 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -33,15 +33,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 3d6010e..d655baa 100644
--- 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 f5dd89c..96ac556 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -30,11 +30,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 a9c702c..c5c6999 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -54,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
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 5f46b87..0a5c61a 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -87,14 +87,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/hummingboard.h b/include/configs/hummingboard.h
index 0566b2e..8fd965d 100644
--- a/include/configs/hummingboard.h
+++ b/include/configs/hummingboard.h
@@ -34,16 +34,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	1
 #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_FEC_MXC
 #ifdef CONFIG_FEC_MXC
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 862f668..e230879 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -84,4 +84,12 @@ 
 /* GPIO */
 #define CONFIG_MXC_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 6450f32..211fba3 100644
--- 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 078f616..20b1f9c 100644
--- 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 2812fd2..97ea6d1 100644
--- 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 5bb84c4..c613a2b 100644
--- 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 e412803..8e98c8e 100644
--- 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 927f2a9..289a619 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -54,16 +54,9 @@ 
 #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_MX6Q
 #define CONFIG_CMD_SATA
 #endif
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 20a077d..b6e8521 100644
--- 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 9a74fdd..7165877 100644
--- 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 3b207e8..99aa3d5 100644
--- 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 c5d606e..7b28671 100644
--- 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 5ec2ba6..72e3a8f 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -61,16 +61,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_BOUNCE_BUFFER
-
 /* Ethernet */
 #define CONFIG_FEC_MXC
 #define CONFIG_CMD_PING
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index c61dd22..311634f 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -37,16 +37,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 2ba0aed..4fbe60b 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -80,15 +80,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 7c18d24..84c3606 100644
--- 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 b2cec99..939c4ba 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -38,16 +38,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 50119f0..caf5d3f 100644
--- 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