Merge branch 'master' of git://git.denx.de/u-boot-video

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

diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 1cd7dae85b3fe563656a7ef9b38352d146eb6d0e..08130ebd1b6cbd8b44befabaaac58519b5972930 100644 (file)
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -57,12 +57,13 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_CLK         48000000
+#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#define CONFIG_SYS_NS16550_CLK         48000000
-#define CONFIG_CONS_INDEX              3
 #define CONFIG_SYS_NS16550_COM3                UART3_BASE
+#endif
+#define CONFIG_CONS_INDEX              3
 
 /* TWL6030 */
 #ifndef CONFIG_SPL_BUILD