diff options
| -rw-r--r-- | drivers/arm/pl011/aarch32/pl011_console.S | 10 | ||||
| -rw-r--r-- | drivers/arm/pl011/aarch64/pl011_console.S | 10 | ||||
| -rw-r--r-- | drivers/console/aarch32/console.S | 13 | ||||
| -rw-r--r-- | drivers/console/aarch32/deprecated_console.S | 112 | ||||
| -rw-r--r-- | drivers/console/aarch64/console.S | 13 | ||||
| -rw-r--r-- | drivers/console/aarch64/deprecated_console.S | 111 | ||||
| -rw-r--r-- | make_helpers/defaults.mk | 2 |
7 files changed, 3 insertions, 268 deletions
diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S index a85a9374..b85d2e77 100644 --- a/drivers/arm/pl011/aarch32/pl011_console.S +++ b/drivers/arm/pl011/aarch32/pl011_console.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,14 +9,6 @@ #include <console_macros.S> #include <drivers/arm/pl011.h> -#if !MULTI_CONSOLE_API -/* - * Pull in generic functions to provide backwards compatibility for - * platform makefiles - */ -#include "../../../console/aarch32/console.S" -#endif - /* * "core" functions are low-level implementations that don't require * writeable memory and are thus safe to call in BL1 crash context. diff --git a/drivers/arm/pl011/aarch64/pl011_console.S b/drivers/arm/pl011/aarch64/pl011_console.S index 52f25036..c772a9ec 100644 --- a/drivers/arm/pl011/aarch64/pl011_console.S +++ b/drivers/arm/pl011/aarch64/pl011_console.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,14 +9,6 @@ #include <console_macros.S> #include <drivers/arm/pl011.h> -#if !MULTI_CONSOLE_API -/* - * Pull in generic functions to provide backwards compatibility for - * platform makefiles - */ -#include "../../../console/aarch64/console.S" -#endif - /* * "core" functions are low-level implementations that don't require * writable memory and are thus safe to call in BL1 crash context. diff --git a/drivers/console/aarch32/console.S b/drivers/console/aarch32/console.S deleted file mode 100644 index 1c380944..00000000 --- a/drivers/console/aarch32/console.S +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - - #if MULTI_CONSOLE_API - #if ERROR_DEPRECATED - #error "console.S is deprecated, platforms should no longer link it explicitly" - #endif - #else - #include "deprecated_console.S" - #endif diff --git a/drivers/console/aarch32/deprecated_console.S b/drivers/console/aarch32/deprecated_console.S deleted file mode 100644 index f7e3c4f2..00000000 --- a/drivers/console/aarch32/deprecated_console.S +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#include <asm_macros.S> - -/* - * This is the common console core code for the deprecated single-console API. - * New platforms should set MULTI_CONSOLE_API=1 and not use this file. - */ -#warning "Using deprecated console implementation. Please migrate to MULTI_CONSOLE_API" - - .globl console_init - .globl console_uninit - .globl console_putc - .globl console_getc - .globl console_flush - - /* - * The console base is in the data section and not in .bss - * even though it is zero-init. In particular, this allows - * the console functions to start using this variable before - * the runtime memory is initialized for images which do not - * need to copy the .data section from ROM to RAM. - */ -.section .data.console_base ; .align 2 - console_base: .word 0x0 - - /* ----------------------------------------------- - * int console_init(uintptr_t base_addr, - * unsigned int uart_clk, unsigned int baud_rate) - * Function to initialize the console without a - * C Runtime to print debug information. It saves - * the console base to the data section. - * In: r0 - console base address - * r1 - Uart clock in Hz - * r2 - Baud rate - * out: return 1 on success else 0 on error - * Clobber list : r1 - r3 - * ----------------------------------------------- - */ -func console_init - /* Check the input base address */ - cmp r0, #0 - beq init_fail - ldr r3, =console_base - str r0, [r3] - b console_core_init -init_fail: - bx lr -endfunc console_init - - /* ----------------------------------------------- - * void console_uninit(void) - * Function to finish the use of console driver. - * It sets the console_base as NULL so that any - * further invocation of `console_putc` or - * `console_getc` APIs would return error. - * ----------------------------------------------- - */ -func console_uninit - mov r0, #0 - ldr r3, =console_base - str r0, [r3] - bx lr -endfunc console_uninit - - /* --------------------------------------------- - * int console_putc(int c) - * Function to output a character over the - * console. It returns the character printed on - * success or -1 on error. - * In : r0 - character to be printed - * Out : return -1 on error else return character. - * Clobber list : r1, r2 - * --------------------------------------------- - */ -func console_putc - ldr r2, =console_base - ldr r1, [r2] - b console_core_putc -endfunc console_putc - - /* --------------------------------------------- - * int console_getc(void) - * Function to get a character from the console. - * It returns the character grabbed on success - * or -1 on error. - * Clobber list : r0, r1 - * --------------------------------------------- - */ -func console_getc - ldr r1, =console_base - ldr r0, [r1] - b console_core_getc -endfunc console_getc - - /* --------------------------------------------- - * int console_flush(void) - * Function to force a write of all buffered - * data that hasn't been output. It returns 0 - * upon successful completion, otherwise it - * returns -1. - * Clobber list : r0, r1 - * --------------------------------------------- - */ -func console_flush - ldr r1, =console_base - ldr r0, [r1] - b console_core_flush -endfunc console_flush diff --git a/drivers/console/aarch64/console.S b/drivers/console/aarch64/console.S deleted file mode 100644 index 669b31a6..00000000 --- a/drivers/console/aarch64/console.S +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#if MULTI_CONSOLE_API -#if ERROR_DEPRECATED -#error "console.S is deprecated, platforms should no longer link it explicitly" -#endif -#else -#include "deprecated_console.S" -#endif diff --git a/drivers/console/aarch64/deprecated_console.S b/drivers/console/aarch64/deprecated_console.S deleted file mode 100644 index d6ecc4df..00000000 --- a/drivers/console/aarch64/deprecated_console.S +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#include <asm_macros.S> - -/* - * This is the common console core code for the deprecated single-console API. - * New platforms should set MULTI_CONSOLE_API=1 and not use this file. - */ -#warning "Using deprecated console implementation. Please migrate to MULTI_CONSOLE_API" - - .globl console_init - .globl console_uninit - .globl console_putc - .globl console_getc - .globl console_flush - - /* - * The console base is in the data section and not in .bss - * even though it is zero-init. In particular, this allows - * the console functions to start using this variable before - * the runtime memory is initialized for images which do not - * need to copy the .data section from ROM to RAM. - */ -.section .data.console_base ; .align 3 - console_base: .quad 0x0 - - /* ----------------------------------------------- - * int console_init(uintptr_t base_addr, - * unsigned int uart_clk, unsigned int baud_rate) - * Function to initialize the console without a - * C Runtime to print debug information. It saves - * the console base to the data section. - * In: x0 - console base address - * w1 - Uart clock in Hz - * w2 - Baud rate - * out: return 1 on success else 0 on error - * Clobber list : x1 - x4 - * ----------------------------------------------- - */ -func console_init - /* Check the input base address */ - cbz x0, init_fail - adrp x3, console_base - str x0, [x3, :lo12:console_base] - b console_core_init -init_fail: - ret -endfunc console_init - - /* ----------------------------------------------- - * void console_uninit(void) - * Function to finish the use of console driver. - * It sets the console_base as NULL so that any - * further invocation of `console_putc` or - * `console_getc` APIs would return error. - * ----------------------------------------------- - */ -func console_uninit - mov x0, #0 - adrp x3, console_base - str x0, [x3, :lo12:console_base] - ret -endfunc console_uninit - - /* --------------------------------------------- - * int console_putc(int c) - * Function to output a character over the - * console. It returns the character printed on - * success or -1 on error. - * In : x0 - character to be printed - * Out : return -1 on error else return character. - * Clobber list : x1, x2 - * --------------------------------------------- - */ -func console_putc - adrp x2, console_base - ldr x1, [x2, :lo12:console_base] - b console_core_putc -endfunc console_putc - - /* --------------------------------------------- - * int console_getc(void) - * Function to get a character from the console. - * It returns the character grabbed on success - * or -1 on error. - * Clobber list : x0, x1 - * --------------------------------------------- - */ -func console_getc - adrp x1, console_base - ldr x0, [x1, :lo12:console_base] - b console_core_getc -endfunc console_getc - - /* --------------------------------------------- - * int console_flush(void) - * Function to force a write of all buffered - * data that hasn't been output. It returns 0 - * upon successful completion, otherwise it - * returns -1. - * Clobber list : x0, x1 - * --------------------------------------------- - */ -func console_flush - adrp x1, console_base - ldr x0, [x1, :lo12:console_base] - b console_core_flush -endfunc console_flush diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk index 6becf808..1d3a7265 100644 --- a/make_helpers/defaults.mk +++ b/make_helpers/defaults.mk @@ -138,7 +138,7 @@ KEY_ALG := rsa # Enable use of the console API allowing multiple consoles to be registered # at the same time. -MULTI_CONSOLE_API := 0 +MULTI_CONSOLE_API := 1 # NS timer register save and restore NS_TIMER_SWITCH := 0 |