diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-10-17 15:29:34 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-10-25 09:56:09 +0100 |
| commit | 9c675b374a88f273f23f590bd5665be074c734d3 (patch) | |
| tree | d28769794a708ff070a19b18cf6b1b0ee6eaff88 /plat/hisilicon | |
| parent | bde25ae28f0ff5db7963d0bd6344afddfd599fc6 (diff) | |
Add plat_crash_console_flush to platforms without it
Even though at this point plat_crash_console_flush is optional, it will
stop being optional in a following patch.
The console driver of warp7 doesn't support flush, so the implementation
is a placeholder.
TI had ``plat_crash_console_init`` and ``plat_crash_console_putc``, but
they weren't global so they weren't actually used. Also, they were
calling the wrong functions.
imx8_helpers.S only has placeholders for all of the functions.
Change-Id: I8d17bbf37c7dad74e134c61ceb92acb9af497718
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'plat/hisilicon')
| -rw-r--r-- | plat/hisilicon/hikey/aarch64/hikey_helpers.S | 14 | ||||
| -rw-r--r-- | plat/hisilicon/hikey960/aarch64/hikey960_helpers.S | 16 |
2 files changed, 29 insertions, 1 deletions
diff --git a/plat/hisilicon/hikey/aarch64/hikey_helpers.S b/plat/hisilicon/hikey/aarch64/hikey_helpers.S index 32ff8b40..9dfdae49 100644 --- a/plat/hisilicon/hikey/aarch64/hikey_helpers.S +++ b/plat/hisilicon/hikey/aarch64/hikey_helpers.S @@ -12,6 +12,7 @@ .globl platform_mem_init .globl plat_crash_console_init .globl plat_crash_console_putc + .globl plat_crash_console_flush .globl plat_report_exception .globl plat_reset_handler @@ -61,6 +62,19 @@ func plat_crash_console_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 : x0, x1 + * --------------------------------------------- + */ +func plat_crash_console_flush + mov_imm x0, CRASH_CONSOLE_BASE + b console_core_flush +endfunc plat_crash_console_flush + + /* --------------------------------------------- * void plat_report_exception(unsigned int type) * Function to report an unhandled exception * with platform-specific means. diff --git a/plat/hisilicon/hikey960/aarch64/hikey960_helpers.S b/plat/hisilicon/hikey960/aarch64/hikey960_helpers.S index d18399fb..550c5604 100644 --- a/plat/hisilicon/hikey960/aarch64/hikey960_helpers.S +++ b/plat/hisilicon/hikey960/aarch64/hikey960_helpers.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -14,6 +14,7 @@ .globl platform_mem_init .globl plat_crash_console_init .globl plat_crash_console_putc + .globl plat_crash_console_flush .globl plat_report_exception .globl plat_reset_handler .globl clr_ex @@ -65,6 +66,19 @@ func plat_crash_console_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 : x0, x1 + * --------------------------------------------- + */ +func plat_crash_console_flush + mov_imm x0, CRASH_CONSOLE_BASE + b console_core_flush +endfunc plat_crash_console_flush + + /* --------------------------------------------- * void plat_report_exception(unsigned int type) * Function to report an unhandled exception * with platform-specific means. |