diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/arm/pl011/aarch32/pl011_console.S | 11 | ||||
| -rw-r--r-- | drivers/arm/pl011/aarch64/pl011_console.S | 11 | ||||
| -rw-r--r-- | drivers/cadence/uart/aarch64/cdns_console.S | 11 | ||||
| -rw-r--r-- | drivers/console/aarch64/skeleton_console.S | 2 | ||||
| -rw-r--r-- | drivers/console/multi_console.c | 4 | ||||
| -rw-r--r-- | drivers/ti/uart/aarch64/16550_console.S | 11 |
6 files changed, 0 insertions, 50 deletions
diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S index b85d2e776..e1e346c2f 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 c772a9ec3..04de99fbc 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) diff --git a/drivers/cadence/uart/aarch64/cdns_console.S b/drivers/cadence/uart/aarch64/cdns_console.S index 8b3837997..ecd0c478d 100644 --- a/drivers/cadence/uart/aarch64/cdns_console.S +++ b/drivers/cadence/uart/aarch64/cdns_console.S @@ -51,7 +51,6 @@ core_init_fail: ret endfunc console_cdns_core_init -#if MULTI_CONSOLE_API .globl console_cdns_register /* ----------------------------------------------- @@ -85,16 +84,6 @@ func console_cdns_register register_fail: ret x7 endfunc console_cdns_register -#else - .globl console_core_init - .globl console_core_putc - .globl console_core_getc - .globl console_core_flush - .equ console_core_init,console_cdns_core_init - .equ console_core_putc,console_cdns_core_putc - .equ console_core_getc,console_cdns_core_getc - .equ console_core_flush,console_cdns_core_flush -#endif /* -------------------------------------------------------- * int console_cdns_core_putc(int c, uintptr_t base_addr) diff --git a/drivers/console/aarch64/skeleton_console.S b/drivers/console/aarch64/skeleton_console.S index 1ba219678..c695ddec4 100644 --- a/drivers/console/aarch64/skeleton_console.S +++ b/drivers/console/aarch64/skeleton_console.S @@ -22,8 +22,6 @@ * any function may always clobber the intra-procedure-call registers * X16 and X17, but may never depend on them retaining their values * across any function call.) - * Platforms using drivers based on this template need to enable - * MULTI_CONSOLE_API := 1 in their platform.mk. */ .globl console_xxx_register diff --git a/drivers/console/multi_console.c b/drivers/console/multi_console.c index 1ec81c3c6..d9eba7f02 100644 --- a/drivers/console/multi_console.c +++ b/drivers/console/multi_console.c @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#if MULTI_CONSOLE_API - #include <assert.h> #include <drivers/console.h> @@ -121,5 +119,3 @@ int console_flush(void) return err; } - -#endif /* MULTI_CONSOLE_API */ diff --git a/drivers/ti/uart/aarch64/16550_console.S b/drivers/ti/uart/aarch64/16550_console.S index 55db5031e..dab46e8c5 100644 --- a/drivers/ti/uart/aarch64/16550_console.S +++ b/drivers/ti/uart/aarch64/16550_console.S @@ -83,7 +83,6 @@ init_fail: ret endfunc console_16550_core_init -#if MULTI_CONSOLE_API .globl console_16550_register /* ----------------------------------------------- @@ -117,16 +116,6 @@ func console_16550_register register_fail: ret x7 endfunc console_16550_register -#else - .globl console_core_init - .globl console_core_putc - .globl console_core_getc - .globl console_core_flush - .equ console_core_init,console_16550_core_init - .equ console_core_putc,console_16550_core_putc - .equ console_core_getc,console_16550_core_getc - .equ console_core_flush,console_16550_core_flush -#endif /* -------------------------------------------------------- * int console_16550_core_putc(int c, uintptr_t base_addr) |