From: Tom Rini <trini@konsulko.com>
Date: Thu, 17 Sep 2015 20:47:03 +0000 (-0400)
Subject: ti_omap4_common.h: Switch to CONFIG_OMAP_SERIAL for non-SPL DM_SERIAL
X-Git-Tag: v2016.01-rc1~276
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=53ee6342b86ddcbc89db1c9a7de816a13a09ef12;p=oweals%2Fu-boot.git

ti_omap4_common.h: Switch to CONFIG_OMAP_SERIAL for non-SPL DM_SERIAL

Tested on Pandaboard
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 1cd7dae85b..741f71fc16 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -58,11 +58,15 @@
  * Hardware drivers
  */
 #define CONFIG_SYS_NS16550
+#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
+#else
+#define CONFIG_OMAP_SERIAL
+#endif
+#define CONFIG_CONS_INDEX		3
 
 /* TWL6030 */
 #ifndef CONFIG_SPL_BUILD