summaryrefslogtreecommitdiff
path: root/include/configs/ti_armv7_keystone2.h
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2015-09-19 15:00:20 +0530
committerTom Rini <trini@konsulko.com>2015-10-22 14:20:35 -0400
commit391839fb0484159bdacd1493f09e54afbf8ac475 (patch)
tree05c303a45213fc164c8f2151e92958dd24e41c64 /include/configs/ti_armv7_keystone2.h
parent8a9bb065da466fe7e26dae7b2f234bb2135c7b9e (diff)
ARM: dts: k2hk: Enable OF_CONTROL and DM
Import k2hk specific DT files from Linux Kernel and enable OF_CONTROL, DM, DM_SERIAL. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'include/configs/ti_armv7_keystone2.h')
-rw-r--r--include/configs/ti_armv7_keystone2.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index acc686c033..183076067b 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -59,9 +59,13 @@
/* UART Configuration */
#define CONFIG_SYS_NS16550
-#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_MEM32
+#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
+#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE -4
+#else
+#define CONFIG_KEYSTONE_SERIAL
+#endif
#define CONFIG_SYS_NS16550_COM1 KS2_UART0_BASE
#define CONFIG_SYS_NS16550_COM2 KS2_UART1_BASE
#define CONFIG_SYS_NS16550_CLK clk_get_rate(KS2_CLK1_6)