Merge "ti: k3: common: Make UART number configurable" into integration

4 years ago · 967a6d162d
2 changed files with 4 additions and 1 deletions
--- 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))
--- 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 */