summaryrefslogtreecommitdiff
path: root/plat/ti/k3
diff options
context:
space:
mode:
authorMadhukar Pappireddy <madhukar.pappireddy@arm.com>2020-06-05 22:32:13 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-06-05 22:32:13 +0000
commit967a6d162d9dc1c5ae154f289bcdecc03cb9eb7c (patch)
treea3175ef33be4615072666bc1bf1fe074b60d28d9 /plat/ti/k3
parent06fdb3f0cecc725890447677be34cc75bbd8f6ec (diff)
parent5621fe252f4876f62a50318b7a8012a21ff2abf4 (diff)
Merge "ti: k3: common: Make UART number configurable" into integration
Diffstat (limited to 'plat/ti/k3')
-rw-r--r--plat/ti/k3/common/plat_common.mk3
-rw-r--r--plat/ti/k3/include/platform_def.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/plat/ti/k3/common/plat_common.mk b/plat/ti/k3/common/plat_common.mk
index 03d39f186..c00262bcf 100644
--- a/plat/ti/k3/common/plat_common.mk
+++ b/plat/ti/k3/common/plat_common.mk
@@ -37,6 +37,9 @@ ENABLE_PIE := 1
TI_16550_MDR_QUIRK := 1
$(eval $(call add_define,TI_16550_MDR_QUIRK))
+K3_USART := 0
+$(eval $(call add_define,K3_USART))
+
# Allow customizing the UART baud rate
K3_USART_BAUD := 115200
$(eval $(call add_define,K3_USART_BAUD))
diff --git a/plat/ti/k3/include/platform_def.h b/plat/ti/k3/include/platform_def.h
index 690c68e5c..98db626e2 100644
--- a/plat/ti/k3/include/platform_def.h
+++ b/plat/ti/k3/include/platform_def.h
@@ -91,7 +91,7 @@
/* Platform default console definitions */
#ifndef K3_USART_BASE
-#define K3_USART_BASE 0x02800000
+#define K3_USART_BASE (0x02800000 + 0x10000 * K3_USART)
#endif
/* USART has a default size for address space */