diff options
| author | Usama Arif <usama.arif@arm.com> | 2019-02-11 16:35:42 +0000 |
|---|---|---|
| committer | Usama Arif <usama.arif@arm.com> | 2019-02-18 14:44:28 +0000 |
| commit | 0d28096cd701bb23ea9d6f9a159a60b0c8607597 (patch) | |
| tree | 633f9be4e1e85e022cc73d71ac94689cbc8fa20e /plat | |
| parent | fa233ac9d435905d2717a9880cfb3a1671e37134 (diff) | |
| download | platform_external_arm-trusted-firmware-0d28096cd701bb23ea9d6f9a159a60b0c8607597.tar.gz platform_external_arm-trusted-firmware-0d28096cd701bb23ea9d6f9a159a60b0c8607597.tar.bz2 platform_external_arm-trusted-firmware-0d28096cd701bb23ea9d6f9a159a60b0c8607597.zip | |
Rename PLAT_ARM_BL31_RUN_UART* variable
The variable is renamed to PLAT_ARM_RUN_UART as
the UART is used outside BL31 as well.
Change-Id: I00e3639dfb2001758b7d24548c11236c6335f64a
Signed-off-by: Usama Arif <usama.arif@arm.com>
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/arm/board/fvp/include/platform_def.h | 8 | ||||
| -rw-r--r-- | plat/arm/board/n1sdp/include/platform_def.h | 8 | ||||
| -rw-r--r-- | plat/arm/common/arm_console.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h index 115310175..7a538e9c5 100644 --- a/plat/arm/board/fvp/include/platform_def.h +++ b/plat/arm/board/fvp/include/platform_def.h @@ -173,14 +173,14 @@ #define PLAT_ARM_BOOT_UART_BASE V2M_IOFPGA_UART0_BASE #define PLAT_ARM_BOOT_UART_CLK_IN_HZ V2M_IOFPGA_UART0_CLK_IN_HZ -#define PLAT_ARM_BL31_RUN_UART_BASE V2M_IOFPGA_UART1_BASE -#define PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ V2M_IOFPGA_UART1_CLK_IN_HZ +#define PLAT_ARM_RUN_UART_BASE V2M_IOFPGA_UART1_BASE +#define PLAT_ARM_RUN_UART_CLK_IN_HZ V2M_IOFPGA_UART1_CLK_IN_HZ #define PLAT_ARM_SP_MIN_RUN_UART_BASE V2M_IOFPGA_UART1_BASE #define PLAT_ARM_SP_MIN_RUN_UART_CLK_IN_HZ V2M_IOFPGA_UART1_CLK_IN_HZ -#define PLAT_ARM_CRASH_UART_BASE PLAT_ARM_BL31_RUN_UART_BASE -#define PLAT_ARM_CRASH_UART_CLK_IN_HZ PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ +#define PLAT_ARM_CRASH_UART_BASE PLAT_ARM_RUN_UART_BASE +#define PLAT_ARM_CRASH_UART_CLK_IN_HZ PLAT_ARM_RUN_UART_CLK_IN_HZ #define PLAT_ARM_TSP_UART_BASE V2M_IOFPGA_UART2_BASE #define PLAT_ARM_TSP_UART_CLK_IN_HZ V2M_IOFPGA_UART2_CLK_IN_HZ diff --git a/plat/arm/board/n1sdp/include/platform_def.h b/plat/arm/board/n1sdp/include/platform_def.h index 7b8c367a2..83b9f52d2 100644 --- a/plat/arm/board/n1sdp/include/platform_def.h +++ b/plat/arm/board/n1sdp/include/platform_def.h @@ -15,14 +15,14 @@ #define PLAT_ARM_BOOT_UART_BASE 0x2A400000 #define PLAT_ARM_BOOT_UART_CLK_IN_HZ 50000000 -#define PLAT_ARM_BL31_RUN_UART_BASE 0x2A410000 -#define PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ 50000000 +#define PLAT_ARM_RUN_UART_BASE 0x2A410000 +#define PLAT_ARM_RUN_UART_CLK_IN_HZ 50000000 #define PLAT_ARM_SP_MIN_RUN_UART_BASE 0x2A410000 #define PLAT_ARM_SP_MIN_RUN_UART_CLK_IN_HZ 50000000 -#define PLAT_ARM_CRASH_UART_BASE PLAT_ARM_BL31_RUN_UART_BASE -#define PLAT_ARM_CRASH_UART_CLK_IN_HZ PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ +#define PLAT_ARM_CRASH_UART_BASE PLAT_ARM_RUN_UART_BASE +#define PLAT_ARM_CRASH_UART_CLK_IN_HZ PLAT_ARM_RUN_UART_CLK_IN_HZ #define PLAT_ARM_DRAM2_SIZE ULL(0x780000000) diff --git a/plat/arm/common/arm_console.c b/plat/arm/common/arm_console.c index 03670858c..84886b470 100644 --- a/plat/arm/common/arm_console.c +++ b/plat/arm/common/arm_console.c @@ -61,8 +61,8 @@ void arm_console_boot_end(void) void arm_console_runtime_init(void) { #if MULTI_CONSOLE_API - int rc = console_pl011_register(PLAT_ARM_BL31_RUN_UART_BASE, - PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ, + int rc = console_pl011_register(PLAT_ARM_RUN_UART_BASE, + PLAT_ARM_RUN_UART_CLK_IN_HZ, ARM_CONSOLE_BAUDRATE, &arm_runtime_console); if (rc == 0) @@ -70,8 +70,8 @@ void arm_console_runtime_init(void) console_set_scope(&arm_runtime_console.console, CONSOLE_FLAG_RUNTIME); #else - (void)console_init(PLAT_ARM_BL31_RUN_UART_BASE, - PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ, + (void)console_init(PLAT_ARM_RUN_UART_BASE, + PLAT_ARM_RUN_UART_CLK_IN_HZ, ARM_CONSOLE_BAUDRATE); #endif /* MULTI_CONSOLE_API */ } |