diff options
author | Ambroise Vincent <ambroise.vincent@arm.com> | 2019-04-04 09:13:28 +0100 |
---|---|---|
committer | Ambroise Vincent <ambroise.vincent@arm.com> | 2019-06-28 10:52:48 +0100 |
commit | 5b6ebeec9c99f8d6a539d3b15e5dfb827891174a (patch) | |
tree | 1e72bd9f7afdc361596977491a88e6ee89176658 /plat/layerscape | |
parent | 51e24ec2c6f4d72df50cf62766311f3773d4e117 (diff) |
Remove MULTI_CONSOLE_API flag and references to it
The new API becomes the default one.
Change-Id: Ic1d602da3dff4f4ebbcc158b885295c902a24fec
Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>
Diffstat (limited to 'plat/layerscape')
-rw-r--r-- | plat/layerscape/board/ls1043/platform.mk | 3 | ||||
-rw-r--r-- | plat/layerscape/common/aarch64/ls_console.S | 11 | ||||
-rw-r--r-- | plat/layerscape/common/aarch64/ls_helpers.S | 40 |
3 files changed, 0 insertions, 54 deletions
diff --git a/plat/layerscape/board/ls1043/platform.mk b/plat/layerscape/board/ls1043/platform.mk index 2e0e59bd..d716c61e 100644 --- a/plat/layerscape/board/ls1043/platform.mk +++ b/plat/layerscape/board/ls1043/platform.mk @@ -56,9 +56,6 @@ BL31_SOURCES += plat/layerscape/board/ls1043/ls1043_bl31_setup.c \ ${LS1043_INTERCONNECT_SOURCES} \ ${LS1043_SECURITY_SOURCES} -# Disable the PSCI platform compatibility layer -MULTI_CONSOLE_API := 1 - # Enable workarounds for selected Cortex-A53 erratas. ERRATA_A53_855873 := 1 diff --git a/plat/layerscape/common/aarch64/ls_console.S b/plat/layerscape/common/aarch64/ls_console.S index a3c270dc..f8948b4a 100644 --- a/plat/layerscape/common/aarch64/ls_console.S +++ b/plat/layerscape/common/aarch64/ls_console.S @@ -78,7 +78,6 @@ init_fail: ret endfunc console_ls_16550_core_init -#if MULTI_CONSOLE_API .globl console_ls_16550_register /* ----------------------------------------------- @@ -111,16 +110,6 @@ func console_ls_16550_register register_fail: ret x7 endfunc console_ls_16550_register -#else - .globl console_core_init - .globl console_core_putc - .globl console_core_getc - .globl console_core_flush - .equ console_core_init,console_ls_16550_core_init - .equ console_core_putc,console_ls_16550_core_putc - .equ console_core_getc,console_ls_16550_core_getc - .equ console_core_flush,console_ls_16550_core_flush -#endif /* -------------------------------------------------------- * int console_ls_16550_core_putc(int c, uintptr_t base_addr) diff --git a/plat/layerscape/common/aarch64/ls_helpers.S b/plat/layerscape/common/aarch64/ls_helpers.S index bbddd0b5..5aa54977 100644 --- a/plat/layerscape/common/aarch64/ls_helpers.S +++ b/plat/layerscape/common/aarch64/ls_helpers.S @@ -49,7 +49,6 @@ endfunc plat_ls_calc_core_pos * --------------------------------------------- */ -#if MULTI_CONSOLE_API /* ----------------------------------------------------- * int plat_crash_console_init(void) * Use normal console by default. Switch it to crash @@ -101,45 +100,6 @@ func plat_crash_console_flush b console_flush endfunc plat_crash_console_flush -#else /* MULTI_CONSOLE_API */ - - /* ----------------------------------------------------- - * In the old API these are all no-op stubs that need to - * be overridden by the platform to be useful. - * ----------------------------------------------------- - */ -func plat_crash_console_init - mov_imm x0, PLAT_LS1043_UART_BASE - mov_imm x1, PLAT_LS1043_UART_CLOCK - mov_imm x2, PLAT_LS1043_UART_BAUDRATE - b console_core_init -endfunc plat_crash_console_init - - /* --------------------------------------------- - * int plat_crash_console_putc(int c) - * Function to print a character on the crash - * console without a C Runtime. - * Clobber list : x1, x2 - * --------------------------------------------- - */ -func plat_crash_console_putc - mov_imm x1, PLAT_LS1043_UART_BASE - b console_core_putc -endfunc plat_crash_console_putc - - /* --------------------------------------------- - * int plat_crash_console_flush() - * Function to force a write of all buffered - * data that hasn't been output. - * Out : return -1 on error else return 0. - * Clobber list : r0 - r1 - * --------------------------------------------- - */ -func plat_crash_console_flush - mov_imm x1, PLAT_LS1043_UART_BASE - b console_core_flush -endfunc plat_crash_console_flush -#endif /* --------------------------------------------------------------------- * We don't need to carry out any memory initialization on LS * platforms. The Secure SRAM is accessible straight away. |