All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [RFC v0 09/11] omap3: Consolidate HSMMC support into omap3_common.h
Date: Thu, 22 Mar 2012 12:09:15 -0700	[thread overview]
Message-ID: <1332443357-14062-10-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1332443357-14062-1-git-send-email-trini@ti.com>

Signed-off-by: Tom Rini <trini@ti.com>
---
 include/configs/am3517_crane.h         |    5 -----
 include/configs/am3517_evm.h           |    4 ----
 include/configs/cm_t35.h               |    5 -----
 include/configs/devkit8000.h           |    6 ------
 include/configs/dig297.h               |    5 -----
 include/configs/igep00x0.h             |    5 -----
 include/configs/mcx.h                  |    4 ----
 include/configs/omap3_beagle.h         |    5 -----
 include/configs/omap3_common.h         |    9 +++++++++
 include/configs/omap3_evm.h            |    9 +--------
 include/configs/omap3_evm_quick_mmc.h  |    6 ------
 include/configs/omap3_evm_quick_nand.h |    1 +
 include/configs/omap3_logic.h          |    5 -----
 include/configs/omap3_mvblx.h          |    5 -----
 include/configs/omap3_overo.h          |    5 -----
 include/configs/omap3_pandora.h        |    5 -----
 include/configs/omap3_sdp3430.h        |    7 -------
 include/configs/omap3_zoom1.h          |    5 -----
 include/configs/omap3_zoom2.h          |    4 ----
 include/configs/tam3517-common.h       |    4 ----
 include/configs/tricorder.h            |    6 ------
 21 files changed, 11 insertions(+), 99 deletions(-)

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 0c46af4..d607c67 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -56,11 +56,6 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
-
 /*
  * USB configuration
  * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 639e865..eec85ce 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -55,10 +55,6 @@
 #define CONFIG_CONS_INDEX		3
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_MMC			1
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
 
 /*
  * USB configuration
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 9327524..f543e93 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -69,11 +69,6 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
-
 /* USB */
 #define CONFIG_MUSB_UDC
 #define CONFIG_USB_OMAP3
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index af03dcf..68f0b00 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -72,12 +72,6 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
 
-/* MMC */
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
-
 /* I2C */
 #define CONFIG_HARD_I2C			1
 #define CONFIG_SYS_I2C_SPEED		100000
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 808eab2..44a522a 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -67,11 +67,6 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION
-
 /* library portions to compile in */
 #define CONFIG_RBTREE
 #define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h
index 7e955f2..c4c0fb0 100644
--- a/include/configs/igep00x0.h
+++ b/include/configs/igep00x0.h
@@ -44,11 +44,6 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
-
 /* USB */
 #define CONFIG_MUSB_UDC			1
 #define CONFIG_USB_OMAP3		1
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 5dda673..9f95958 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -63,10 +63,6 @@
 #define CONFIG_CONS_INDEX		3
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /* EHCI */
 #define CONFIG_USB_STORAGE
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 298b22b..0857666 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -54,11 +54,6 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
-
 /* Status LED */
 #define CONFIG_STATUS_LED		1
 #define CONFIG_BOARD_SPECIFIC_LED	1
diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h
index 82ecce8..023dc53 100644
--- a/include/configs/omap3_common.h
+++ b/include/configs/omap3_common.h
@@ -89,6 +89,15 @@
 					115200}
 #endif
 
+/* MMC */
+#define CONFIG_CMD_MMC
+#if defined(CONFIG_CMD_MMC)
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC
+#define CONFIG_OMAP_HSMMC
+#define CONFIG_DOS_PARTITION
+#endif
+
 /*
  * Environmnet
  */
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index eba20b4..fb675ce 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -69,11 +69,6 @@
  * ----------------------------------------------------------------------------
  */
 
-/* MMC */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_OMAP_HSMMC
-
 /* SPL */
 #define CONFIG_SPL_MMC_SUPPORT
 #define CONFIG_SPL_FAT_SUPPORT
@@ -82,12 +77,10 @@
 #define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION	1
 #define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME	"u-boot.img"
 
-/* Partition tables */
-/* Only need DOS partition support for SPL, currently */
+/* We can't use EFI partitions in SPL currently. */
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EFI_PARTITION
 #endif
-#define CONFIG_DOS_PARTITION
 
 /* USB
  *
diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h
index 8590fac..9beab16 100644
--- a/include/configs/omap3_evm_quick_mmc.h
+++ b/include/configs/omap3_evm_quick_mmc.h
@@ -47,12 +47,6 @@
  * ----------------------------------------------------------------------------
  */
 
-/* MMC */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
-
 /* -----------------------------------------------------------------------------
  * Include common board configuration
  * -----------------------------------------------------------------------------
diff --git a/include/configs/omap3_evm_quick_nand.h b/include/configs/omap3_evm_quick_nand.h
index ce19dad..1dc46ab 100644
--- a/include/configs/omap3_evm_quick_nand.h
+++ b/include/configs/omap3_evm_quick_nand.h
@@ -25,6 +25,7 @@
  * ----------------------------------------------------------------------------
  */
 #define CONFIG_CMD_NAND
+#undef CONFIG_CMD_MMC
 
 /*
  * Board revision is detected by probing the Ethernet chip.
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 61c3646..db5b7b1 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -58,11 +58,6 @@
 #define CONFIG_SYS_NS16550_COM1		OMAP34XX_UART1
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
-
 /* commands to include */
 #include <config_cmd_default.h>
 
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index c980dc3..d9e4b53 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -65,11 +65,6 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
-
 /* USB */
 #define CONFIG_MUSB_UDC			1
 #define CONFIG_USB_OMAP3		1
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index a794b2c..1cfc333 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -45,11 +45,6 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
-
 /* commands to include */
 #include <config_cmd_default.h>
 
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 6191b76..e364253 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -61,11 +61,6 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
-
 /* commands to include */
 #include <config_cmd_default.h>
 
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index 87e3460..2434d93 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -148,13 +148,6 @@
  * MMC boot support
  */
 
-#if defined(CONFIG_CMD_MMC)
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
-#endif
-
 /*----------------------------------------------------------------------------
  * SMSC9115 Ethernet from SMSC9118 family
  *----------------------------------------------------------------------------
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index e8927a1..3121d67 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -55,11 +55,6 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
-
 /* USB */
 #define CONFIG_MUSB_UDC			1
 #define CONFIG_USB_OMAP3		1
diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index fa895d5..2a8f88c 100644
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -67,10 +67,6 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{115200}
 
-#define CONFIG_GENERIC_MMC		1
-#define CONFIG_MMC			1
-#define CONFIG_OMAP_HSMMC		1
-#define CONFIG_DOS_PARTITION		1
 /* Status LED */
 #define CONFIG_STATUS_LED		1 /* Status LED enabled	*/
 #define CONFIG_BOARD_SPECIFIC_LED	1
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index d2ffc29..0a53f7f 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -56,10 +56,6 @@
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_SYS_NS16550_COM1		OMAP34XX_UART1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /* EHCI */
 #define CONFIG_OMAP3_GPIO_5
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index ee60b13..787a9a6 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -65,12 +65,6 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_BAUDRATE			115200
 
-/* MMC */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
-
 /* I2C */
 #define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SPEED		100000
-- 
1.7.0.4

  parent reply	other threads:[~2012-03-22 19:09 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-22 19:09 [U-Boot] [RFC v0 0/11]: Add <configs/omap3_common.h> Tom Rini
2012-03-22 19:09 ` [U-Boot] [RFC v0 01/11] omap3+: Introduce <configs/omap3_common.h> Tom Rini
2012-03-23  1:48   ` Jason Kridner
2012-03-23 15:26     ` Tom Rini
2012-03-22 19:09 ` [U-Boot] [RFC v0 02/11] omap3: Move DISPLAY_CPUINFO / DISPLAY_BOARDINFO to common Tom Rini
2012-03-22 19:09 ` [U-Boot] [RFC v0 03/11] omap3: Move V_OSCK / V_SCLK to omap3_common.h Tom Rini
2012-03-22 19:09 ` [U-Boot] [RFC v0 04/11] omap3: Move '#undef CONFIG_USE_IRQ' " Tom Rini
2012-03-22 19:09 ` [U-Boot] [RFC v0 05/11] omap3: Move CONFIG_MISC_INIT_R " Tom Rini
2012-03-22 19:09 ` [U-Boot] [RFC v0 06/11] omap3: Move ATAGS and OF_LIBFDT " Tom Rini
2012-03-22 19:09 ` [U-Boot] [RFC v0 07/11] omap3: Move SYS_MALLOC_LEN and ENV_SIZE " Tom Rini
2012-03-22 19:09 ` [U-Boot] [RFC v0 08/11] omap3: Consolidate UART information in omap3_common.h Tom Rini
2012-04-03 21:35   ` Mike Frysinger
2012-04-03 23:45     ` Tom Rini
2012-04-04  2:42       ` Mike Frysinger
2012-04-04 18:19         ` Tom Rini
2012-03-22 19:09 ` Tom Rini [this message]
2012-03-22 19:09 ` [U-Boot] [RFC v0 10/11] omap3: Consolidate NAND " Tom Rini
2012-03-22 19:09 ` [U-Boot] [RFC v0 11/11] omap3: Consolidate I2C information into omap3_common.h Tom Rini
2012-04-03 21:37 ` [U-Boot] [RFC v0 0/11]: Add <configs/omap3_common.h> Mike Frysinger
2012-04-03 23:35   ` Tom Rini
2012-04-04  2:46     ` Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1332443357-14062-10-git-send-email-trini@ti.com \
    --to=trini@ti.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.