diff options
author | Andrew F. Davis <afd@ti.com> | 2019-01-22 13:36:48 -0600 |
---|---|---|
committer | Andrew F. Davis <afd@ti.com> | 2019-04-19 12:56:24 -0400 |
commit | a481f8b81748bb634f46cb07df87156e8e8a75aa (patch) | |
tree | 3e9eb85e88c0d955875954d5c58f11bbf6845d56 /plat/ti | |
parent | 0e985d708e8f429c1fa1f557d3eea90e32de5228 (diff) |
ti: k3: common: Drop _ADDRESS from K3_USART_BASE to match other defines
This makes definitions more consistent, plus helps alignment.
Signed-off-by: Andrew F. Davis <afd@ti.com>
Change-Id: I38fcdd76207586613d9934c9dc83d7a347e9e0fc
Diffstat (limited to 'plat/ti')
-rw-r--r-- | plat/ti/k3/common/k3_bl31_setup.c | 2 | ||||
-rw-r--r-- | plat/ti/k3/common/k3_console.c | 2 | ||||
-rw-r--r-- | plat/ti/k3/include/platform_def.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plat/ti/k3/common/k3_bl31_setup.c b/plat/ti/k3/common/k3_bl31_setup.c index 78fb696b..0cdb4df4 100644 --- a/plat/ti/k3/common/k3_bl31_setup.c +++ b/plat/ti/k3/common/k3_bl31_setup.c @@ -22,7 +22,7 @@ /* Table of regions to map using the MMU */ const mmap_region_t plat_k3_mmap[] = { MAP_REGION_FLAT(SHARED_RAM_BASE, SHARED_RAM_SIZE, MT_DEVICE | MT_RW | MT_SECURE), - MAP_REGION_FLAT(K3_USART_BASE_ADDRESS, K3_USART_SIZE, MT_DEVICE | MT_RW | MT_SECURE), + MAP_REGION_FLAT(K3_USART_BASE, K3_USART_SIZE, MT_DEVICE | MT_RW | MT_SECURE), MAP_REGION_FLAT(K3_GIC_BASE, K3_GIC_SIZE, MT_DEVICE | MT_RW | MT_SECURE), MAP_REGION_FLAT(SEC_PROXY_RT_BASE, SEC_PROXY_RT_SIZE, MT_DEVICE | MT_RW | MT_SECURE), MAP_REGION_FLAT(SEC_PROXY_SCFG_BASE, SEC_PROXY_SCFG_SIZE, MT_DEVICE | MT_RW | MT_SECURE), diff --git a/plat/ti/k3/common/k3_console.c b/plat/ti/k3/common/k3_console.c index 31c96324..ba0ddace 100644 --- a/plat/ti/k3/common/k3_console.c +++ b/plat/ti/k3/common/k3_console.c @@ -16,6 +16,6 @@ void bl31_console_setup(void) static console_16550_t console; /* Initialize the console to provide early debug support */ - console_16550_register(K3_USART_BASE_ADDRESS, K3_USART_CLK_SPEED, + console_16550_register(K3_USART_BASE, K3_USART_CLK_SPEED, K3_USART_BAUD, &console); } diff --git a/plat/ti/k3/include/platform_def.h b/plat/ti/k3/include/platform_def.h index f1511c13..088a9339 100644 --- a/plat/ti/k3/include/platform_def.h +++ b/plat/ti/k3/include/platform_def.h @@ -125,8 +125,8 @@ #define CACHE_WRITEBACK_GRANULE (1 << CACHE_WRITEBACK_SHIFT) /* Platform default console definitions */ -#ifndef K3_USART_BASE_ADDRESS -#define K3_USART_BASE_ADDRESS 0x02800000 +#ifndef K3_USART_BASE +#define K3_USART_BASE 0x02800000 #endif /* USART has a default size for address space */ @@ -137,7 +137,7 @@ #endif /* Crash console defaults */ -#define CRASH_CONSOLE_BASE K3_USART_BASE_ADDRESS +#define CRASH_CONSOLE_BASE K3_USART_BASE #define CRASH_CONSOLE_CLK K3_USART_CLK_SPEED #define CRASH_CONSOLE_BAUD_RATE K3_USART_BAUD |