Remove MULTI_CONSOLE_API flag and references to it

[project/bcm63xx/atf.git] / plat / arm / common / arm_console.c

diff --git a/plat/arm/common/arm_console.c b/plat/arm/common/arm_console.c
index 580b2ee017d8aa7a6b92526aaaed1554f7e85290..123811d7197c07c883a729975bf76521be31585a 100644 (file)
--- a/plat/arm/common/arm_console.c
+++ b/plat/arm/common/arm_console.c
@@ -16,15 +16,12 @@
 /*******************************************************************************
  * Functions that set up the console
  ******************************************************************************/
-#if MULTI_CONSOLE_API
 static console_pl011_t arm_boot_console;
 static console_pl011_t arm_runtime_console;
-#endif
 
 /* Initialize the console to provide early debug support */
 void __init arm_console_boot_init(void)
 {
-#if MULTI_CONSOLE_API
        int rc = console_pl011_register(PLAT_ARM_BOOT_UART_BASE,
                                        PLAT_ARM_BOOT_UART_CLK_IN_HZ,
                                        ARM_CONSOLE_BAUDRATE,
@@ -39,28 +36,17 @@ void __init arm_console_boot_init(void)
        }
 
        console_set_scope(&arm_boot_console.console, CONSOLE_FLAG_BOOT);
-#else
-       (void)console_init(PLAT_ARM_BOOT_UART_BASE,
-                          PLAT_ARM_BOOT_UART_CLK_IN_HZ,
-                          ARM_CONSOLE_BAUDRATE);
-#endif /* MULTI_CONSOLE_API */
 }
 
 void arm_console_boot_end(void)
 {
        (void)console_flush();
-
-#if MULTI_CONSOLE_API
        (void)console_unregister(&arm_boot_console.console);
-#else
-       console_uninit();
-#endif /* MULTI_CONSOLE_API */
 }
 
 /* Initialize the runtime console */
 void arm_console_runtime_init(void)
 {
-#if MULTI_CONSOLE_API
        int rc = console_pl011_register(PLAT_ARM_RUN_UART_BASE,
                                        PLAT_ARM_RUN_UART_CLK_IN_HZ,
                                        ARM_CONSOLE_BAUDRATE,
@@ -69,18 +55,9 @@ void arm_console_runtime_init(void)
                panic();
 
        console_set_scope(&arm_runtime_console.console, CONSOLE_FLAG_RUNTIME);
-#else
-       (void)console_init(PLAT_ARM_RUN_UART_BASE,
-                          PLAT_ARM_RUN_UART_CLK_IN_HZ,
-                          ARM_CONSOLE_BAUDRATE);
-#endif /* MULTI_CONSOLE_API */
 }
 
 void arm_console_runtime_end(void)
 {
        (void)console_flush();
-
-#if !MULTI_CONSOLE_API
-       console_uninit();
-#endif /* !MULTI_CONSOLE_API */
 }