Skip to content

GitLab

Unverified Commit 885b7c85 authored by davidcunado-arm's avatar davidcunado-arm Committed by GitHub
Browse files

Merge pull request #1267 from jeenu-arm/console-fix 

ARM platforms: Fix console address for flush
parents aedbc7b9 f2c83c1a
Show whitespace changes
Inline Side-by-side
plat/arm/common/aarch32/arm_helpers.S
View file @ 885b7c85
/* /*
* Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -68,10 +68,10 @@ endfunc plat_crash_console_putc ...@@ -68,10 +68,10 @@ endfunc plat_crash_console_putc
* Function to force a write of all buffered * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* Out : return -1 on error else return 0. * Out : return -1 on error else return 0.
* Clobber list : r0 - r1 * Clobber list : r0
* --------------------------------------------- * ---------------------------------------------
*/ */
func plat_crash_console_flush func plat_crash_console_flush
ldr r1, =PLAT_ARM_CRASH_UART_BASE ldr r0, =PLAT_ARM_CRASH_UART_BASE
b console_core_flush b console_core_flush
endfunc plat_crash_console_flush endfunc plat_crash_console_flush
plat/arm/common/aarch64/arm_helpers.S
View file @ 885b7c85
/* /*
* Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -70,11 +70,11 @@ endfunc plat_crash_console_putc ...@@ -70,11 +70,11 @@ endfunc plat_crash_console_putc
* Function to force a write of all buffered * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* Out : return -1 on error else return 0. * Out : return -1 on error else return 0.
* Clobber list : r0 - r1 * Clobber list : r0
* --------------------------------------------- * ---------------------------------------------
*/ */
func plat_crash_console_flush func plat_crash_console_flush
mov_imm x1, PLAT_ARM_CRASH_UART_BASE mov_imm x0, PLAT_ARM_CRASH_UART_BASE
b console_core_flush b console_core_flush
endfunc plat_crash_console_flush endfunc plat_crash_console_flush
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment