Commit abfd5719 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Paul Beesley
Browse files

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent f1b78d32
...@@ -23,15 +23,9 @@ func uniphier_console_putc ...@@ -23,15 +23,9 @@ func uniphier_console_putc
0: ldr w2, [x1, #UNIPHIER_UART_LSR] 0: ldr w2, [x1, #UNIPHIER_UART_LSR]
tbz w2, #UNIPHIER_UART_LSR_THRE_BIT, 0b tbz w2, #UNIPHIER_UART_LSR_THRE_BIT, 0b
mov w2, w0 str w0, [x1, #UNIPHIER_UART_TX]
1: str w2, [x1, #UNIPHIER_UART_TX] ret
cmp w2, #'\n'
b.ne 2f
mov w2, #'\r' /* Append '\r' to '\n' */
b 1b
2: ret
endfunc uniphier_console_putc endfunc uniphier_console_putc
/* /*
......
...@@ -32,7 +32,8 @@ static struct uniphier_console uniphier_console = { ...@@ -32,7 +32,8 @@ static struct uniphier_console uniphier_console = {
#if DEBUG #if DEBUG
CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_RUNTIME |
#endif #endif
CONSOLE_FLAG_CRASH, CONSOLE_FLAG_CRASH |
CONSOLE_FLAG_TRANSLATE_CRLF,
.putc = uniphier_console_putc, .putc = uniphier_console_putc,
.getc = uniphier_console_getc, .getc = uniphier_console_getc,
.flush = uniphier_console_flush, .flush = uniphier_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