Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
e4893286
Commit
e4893286
authored
Sep 03, 2019
by
Alexei Fedorov
Committed by
TrustedFirmware Code Review
Sep 03, 2019
Browse files
Merge "uniphier: set CONSOLE_FLAG_TRANSLATE_CRLF and clean up console driver" into integration
parents
f1b78d32
abfd5719
Changes
2
Hide whitespace changes
Inline
Side-by-side
plat/socionext/uniphier/uniphier_console.S
View file @
e4893286
...
...
@@ -23,15 +23,9 @@ func uniphier_console_putc
0
:
ldr
w2
,
[
x1
,
#
UNIPHIER_UART_LSR
]
tbz
w2
,
#
UNIPHIER_UART_LSR_THRE_BIT
,
0
b
mov
w2
,
w0
str
w0
,
[
x1
,
#
UNIPHIER_UART_TX
]
1
:
str
w2
,
[
x1
,
#
UNIPHIER_UART_TX
]
cmp
w2
,
#
'\n'
b.ne
2
f
mov
w2
,
#
'\r'
/*
Append
'\r'
to
'\n'
*/
b
1
b
2
:
ret
ret
endfunc
uniphier_console_putc
/*
...
...
plat/socionext/uniphier/uniphier_console_setup.c
View file @
e4893286
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment