am335x_evm: do not define usb ether gadget when Eth DM is defined

[u-boot] / include / configs / omap3_overo.h

diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index a1a90ec313ec782a3834dd35b3dcbdea31981020..3b1e5d7ff8e5ca0e93bfc37ef6127261f223194f 100644 (file)
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -88,7 +88,6 @@
 #endif /* CONFIG_NAND */
 
 /* Board NAND Info. */
-#define CONFIG_SYS_NAND_QUIET_TEST
 #define CONFIG_SYS_NAND_ADDR           NAND_BASE       /* physical address */
                                                        /* to access nand */
 /* Environment information */
@@ -186,12 +185,6 @@
        "fi;" \
        "run nanddtsboot; " \
 
-/*
- * Miscellaneous configurable options
- */
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT              "Overo # "
-
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START       (OMAP34XX_SDRC_CS0)
 #define CONFIG_SYS_MEMTEST_END         (OMAP34XX_SDRC_CS0 + \
@@ -227,7 +220,7 @@
 #define CONFIG_SYS_CACHELINE_SIZE      64
 
 /* NAND boot config */
-#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16
+#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
 #define CONFIG_SYS_NAND_MAX_ECCPOS  56
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT     64