diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-09-13 12:09:21 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-09-13 12:09:21 +0000 |
| commit | 42cdeb93080f2b54a75be14e4f5ee776872f3f0f (patch) | |
| tree | efb266d579ee70df877d411f0ccccb0696baf2c8 /drivers | |
| parent | e65d3f45d777f086388d13adf2ad8252d60a93a6 (diff) | |
| parent | ebf851ed34eda0a4fcd87a155a13b02f3db8573c (diff) | |
Merge "stm32mp1: manage CONSOLE_FLAG_TRANSLATE_CRLF and cleanup driver" into integration
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/st/uart/aarch32/stm32_console.S | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/drivers/st/uart/aarch32/stm32_console.S b/drivers/st/uart/aarch32/stm32_console.S index 39e449b2..ca3c1f61 100644 --- a/drivers/st/uart/aarch32/stm32_console.S +++ b/drivers/st/uart/aarch32/stm32_console.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -138,34 +138,18 @@ func console_stm32_core_putc /* Check the input parameter */ cmp r1, #0 beq putc_error - /* Prepend '\r' to '\n' */ - cmp r0, #0xA - bne 2f -1: - /* Check Transmit Data Register Empty */ -txe_loop_1: - ldr r2, [r1, #USART_ISR] - tst r2, #USART_ISR_TXE - beq txe_loop_1 - mov r2, #0xD - str r2, [r1, #USART_TDR] - /* Check transmit complete flag */ -tc_loop_1: - ldr r2, [r1, #USART_ISR] - tst r2, #USART_ISR_TC - beq tc_loop_1 -2: + /* Check Transmit Data Register Empty */ -txe_loop_2: +txe_loop: ldr r2, [r1, #USART_ISR] tst r2, #USART_ISR_TXE - beq txe_loop_2 + beq txe_loop str r0, [r1, #USART_TDR] /* Check transmit complete flag */ -tc_loop_2: +tc_loop: ldr r2, [r1, #USART_ISR] tst r2, #USART_ISR_TC - beq tc_loop_2 + beq tc_loop bx lr putc_error: mov r0, #-1 |