@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
*/
@@ -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
*
@@ -47,12 +47,6 @@
* ----------------------------------------------------------------------------
*/
-/* MMC */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
-
/* -----------------------------------------------------------------------------
* Include common board configuration
* -----------------------------------------------------------------------------
@@ -25,6 +25,7 @@
* ----------------------------------------------------------------------------
*/
#define CONFIG_CMD_NAND
+#undef CONFIG_CMD_MMC
/*
* Board revision is detected by probing the Ethernet chip.
@@ -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>
@@ -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
@@ -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>
@@ -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>
@@ -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
*----------------------------------------------------------------------------
@@ -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
@@ -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
@@ -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
@@ -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
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(-)