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 /drivers/arm | |
| 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 'drivers/arm')
| -rw-r--r-- | drivers/arm/pl011/aarch32/pl011_console.S | 11 | ||||
| -rw-r--r-- | drivers/arm/pl011/aarch64/pl011_console.S | 11 |
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S index b85d2e77..e1e346c2 100644 --- a/drivers/arm/pl011/aarch32/pl011_console.S +++ b/drivers/arm/pl011/aarch32/pl011_console.S @@ -86,7 +86,6 @@ core_init_fail: bx lr endfunc console_pl011_core_init -#if MULTI_CONSOLE_API .globl console_pl011_register /* ------------------------------------------------------- @@ -122,16 +121,6 @@ func console_pl011_register register_fail: pop {r4, pc} endfunc console_pl011_register -#else - .globl console_core_init - .globl console_core_putc - .globl console_core_getc - .globl console_core_flush - .equ console_core_init, console_pl011_core_init - .equ console_core_putc, console_pl011_core_putc - .equ console_core_getc, console_pl011_core_getc - .equ console_core_flush, console_pl011_core_flush -#endif /* -------------------------------------------------------- * int console_core_putc(int c, uintptr_t base_addr) diff --git a/drivers/arm/pl011/aarch64/pl011_console.S b/drivers/arm/pl011/aarch64/pl011_console.S index c772a9ec..04de99fb 100644 --- a/drivers/arm/pl011/aarch64/pl011_console.S +++ b/drivers/arm/pl011/aarch64/pl011_console.S @@ -75,7 +75,6 @@ core_init_fail: ret endfunc console_pl011_core_init -#if MULTI_CONSOLE_API .globl console_pl011_register /* ----------------------------------------------- @@ -109,16 +108,6 @@ func console_pl011_register register_fail: ret x7 endfunc console_pl011_register -#else - .globl console_core_init - .globl console_core_putc - .globl console_core_getc - .globl console_core_flush - .equ console_core_init,console_pl011_core_init - .equ console_core_putc,console_pl011_core_putc - .equ console_core_getc,console_pl011_core_getc - .equ console_core_flush,console_pl011_core_flush -#endif /* -------------------------------------------------------- * int console_pl011_core_putc(int c, uintptr_t base_addr) |