diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2018-02-16 22:47:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-16 22:47:06 +0000 |
| commit | 885b7c85c1aa2d4c55ab8eeb848e4b72691fde35 (patch) | |
| tree | a203a6881ab5c1d7770d66b754b4ac9fb019f42a | |
| parent | aedbc7b9e4a7e50ccd7d83af85245fad7ef9438d (diff) | |
| parent | f2c83c1a54fb10d85233737372008803d60eacf2 (diff) | |
| download | platform_external_arm-trusted-firmware-885b7c85c1aa2d4c55ab8eeb848e4b72691fde35.tar.gz platform_external_arm-trusted-firmware-885b7c85c1aa2d4c55ab8eeb848e4b72691fde35.tar.bz2 platform_external_arm-trusted-firmware-885b7c85c1aa2d4c55ab8eeb848e4b72691fde35.zip | |
Merge pull request #1267 from jeenu-arm/console-fix
ARM platforms: Fix console address for flush
| -rw-r--r-- | plat/arm/common/aarch32/arm_helpers.S | 6 | ||||
| -rw-r--r-- | plat/arm/common/aarch64/arm_helpers.S | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plat/arm/common/aarch32/arm_helpers.S b/plat/arm/common/aarch32/arm_helpers.S index f56b21531..c4cfa8a6f 100644 --- a/plat/arm/common/aarch32/arm_helpers.S +++ b/plat/arm/common/aarch32/arm_helpers.S @@ -1,5 +1,5 @@ /* - * 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 */ @@ -68,10 +68,10 @@ endfunc plat_crash_console_putc * Function to force a write of all buffered * data that hasn't been output. * Out : return -1 on error else return 0. - * Clobber list : r0 - r1 + * Clobber list : r0 * --------------------------------------------- */ func plat_crash_console_flush - ldr r1, =PLAT_ARM_CRASH_UART_BASE + ldr r0, =PLAT_ARM_CRASH_UART_BASE b console_core_flush endfunc plat_crash_console_flush diff --git a/plat/arm/common/aarch64/arm_helpers.S b/plat/arm/common/aarch64/arm_helpers.S index 9d3a10819..760a53af2 100644 --- a/plat/arm/common/aarch64/arm_helpers.S +++ b/plat/arm/common/aarch64/arm_helpers.S @@ -1,5 +1,5 @@ /* - * 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 */ @@ -70,11 +70,11 @@ endfunc plat_crash_console_putc * Function to force a write of all buffered * data that hasn't been output. * Out : return -1 on error else return 0. - * Clobber list : r0 - r1 + * Clobber list : r0 * --------------------------------------------- */ 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 endfunc plat_crash_console_flush |