andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uniphier: set CONSOLE_FLAG_TRANSLATE_CRLF and clean up console driver 

This console driver sends '\r' before 'n', not after.
It works, but the convention is "\r\n" (i.e. CRLF)

Instead of fixing it in the driver, set CONSOLE_FLAG_TRANSLATE_CRLF
to leave it to the framework.

Change-Id: I2154e29313739a40dff70cfb5c0f8989136d4ad2
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2019-07-23 12:53:41 +09:00 committed by Paul Beesley
parent f1b78d32fd
commit abfd571974
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plat/socionext/uniphier/uniphier_console.S
View File

@ -23,15 +23,9 @@ func uniphier_console_putc
0: ldr w2, [x1, #UNIPHIER_UART_LSR]
tbz w2, #UNIPHIER_UART_LSR_THRE_BIT, 0b
mov w2, w0
str w0, [x1, #UNIPHIER_UART_TX]
1: str w2, [x1, #UNIPHIER_UART_TX]
cmp w2, #'\n'
b.ne 2f
mov w2, #'\r' /* Append '\r' to '\n' */
b 1b
2: ret
ret
endfunc uniphier_console_putc
/*

3
plat/socionext/uniphier/uniphier_console_setup.c
View File

@ -32,7 +32,8 @@ static struct uniphier_console uniphier_console = {
#if DEBUG
CONSOLE_FLAG_RUNTIME |
#endif
CONSOLE_FLAG_CRASH,
CONSOLE_FLAG_CRASH |
CONSOLE_FLAG_TRANSLATE_CRLF,
.putc = uniphier_console_putc,
.getc = uniphier_console_getc,
.flush = uniphier_console_flush,