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>

diff --git a/include/plat/arm/board/common/board_css_def.h b/include/plat/arm/board/common/board_css_def.h
index a77ea96ef391bd9a7d147103f5ece3efc5394c84..452afbcc8464d4d736a1a00a8bd78a3305f95bcb 100644 (file)
--- a/include/plat/arm/board/common/board_css_def.h
+++ b/include/plat/arm/board/common/board_css_def.h
@@ -61,14 +61,14 @@
 #define PLAT_ARM_BOOT_UART_BASE                        SOC_CSS_UART0_BASE
 #define PLAT_ARM_BOOT_UART_CLK_IN_HZ           SOC_CSS_UART0_CLK_IN_HZ
 
-#define PLAT_ARM_BL31_RUN_UART_BASE            SOC_CSS_UART1_BASE
-#define PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ       SOC_CSS_UART1_CLK_IN_HZ
+#define PLAT_ARM_RUN_UART_BASE         SOC_CSS_UART1_BASE
+#define PLAT_ARM_RUN_UART_CLK_IN_HZ    SOC_CSS_UART1_CLK_IN_HZ
 
 #define PLAT_ARM_SP_MIN_RUN_UART_BASE          SOC_CSS_UART1_BASE
 #define PLAT_ARM_SP_MIN_RUN_UART_CLK_IN_HZ     SOC_CSS_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_UART0_BASE
 #define PLAT_ARM_TSP_UART_CLK_IN_HZ            V2M_IOFPGA_UART0_CLK_IN_HZ

diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h
index 115310175e939416a09fa990acae452f6e8d6ab0..7a538e9c5589499dffa1bae4a78232eae7d6592f 100644 (file)
--- 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 7b8c367a2d4aea840ac0d9a865114f107ad66379..83b9f52d2b6b7ee7c51bdf465f78e86e4384af92 100644 (file)
--- 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 03670858ca3b640fc8ae3600dffbcf97306cf086..84886b470c9f751898d03aed3d0c2c209ae3e934 100644 (file)
--- 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 */
 }