Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
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
5 years ago
by
Alexei Fedorov
Committed by
TrustedFirmware Code Review
5 years ago
Browse files
Options
Download
Plain Diff
Merge "uniphier: set CONSOLE_FLAG_TRANSLATE_CRLF and clean up console driver" into integration
parents
f1b78d32
abfd5719
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
plat/socionext/uniphier/uniphier_console.S
+2
-8
plat/socionext/uniphier/uniphier_console.S
plat/socionext/uniphier/uniphier_console_setup.c
+2
-1
plat/socionext/uniphier/uniphier_console_setup.c
with
4 additions
and
9 deletions
+4
-9
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
/*
...
...
This diff is collapsed.
Click to expand it.
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
,
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help