ns16550: zap CONFIG_NS16550_SERIAL

[oweals/u-boot.git] / include / configs / ti_am335x_common.h

diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index 5ed86d9365cd08aee392bbe77e7c7bf84e5c9ad6..3beb9db143573e92f0e5672a04f2fd4ec5138b6b 100644 (file)
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -19,15 +19,6 @@
 #define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
 #define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
 
-#ifndef CONFIG_SPL_BUILD
-# define CONFIG_DM
-# define CONFIG_CMD_DM
-# define CONFIG_DM_GPIO
-# define CONFIG_DM_SERIAL
-# define CONFIG_OMAP_SERIAL
-# define CONFIG_SYS_MALLOC_F_LEN       (1 << 10)
-#endif
-
 #include <asm/arch/omap.h>
 
 /* NS16550 Configuration */
@@ -39,7 +30,6 @@
 #define CONFIG_SYS_NS16550_CLK         48000000
 
 /* Network defines. */
-#define CONFIG_CMD_NET                 /* 'bootp' and 'tftp' */
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
 #define CONFIG_BOOTP_DNS               /* Configurable parts of CMD_DHCP */
@@ -100,6 +90,6 @@
 #endif
 
 /* Now bring in the rest of the common code. */
-#include <configs/ti_armv7_common.h>
+#include <configs/ti_armv7_omap.h>
 
 #endif /* __CONFIG_TI_AM335X_COMMON_H__ */