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

[u-boot] / include / configs / mv-common.h

diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 92e5429929266dc87f0ad457d11aec44ea0762d1..1ecbd3521f6e6cf8a43cbc5eb69a6a281d8a4251 100644 (file)
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -39,11 +39,17 @@
 /*
  * NS16550 Configuration
  */
+#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM_SERIAL)
+#define CONFIG_DW_SERIAL
+#endif
+
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         CONFIG_SYS_TCLK
+#if !defined(CONFIG_DM_SERIAL)
+#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_COM1                MV_UART_CONSOLE_BASE
+#endif
 
 /*
  * Serial Port configuration
@@ -128,7 +134,7 @@
 /*
  * Common USB/EHCI configuration
  */
-#ifdef CONFIG_CMD_USB
+#if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM)
 #define CONFIG_USB_EHCI                /* Enable EHCI USB support */
 #define CONFIG_USB_STORAGE
 #define CONFIG_DOS_PARTITION