projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next'
[platform/kernel/u-boot.git]
/
board
/
freescale
/
ls1046ardb
/
ls1046ardb.c
diff --git
a/board/freescale/ls1046ardb/ls1046ardb.c
b/board/freescale/ls1046ardb/ls1046ardb.c
index
9af7cf7
..
f2949cf
100644
(file)
--- a/
board/freescale/ls1046ardb/ls1046ardb.c
+++ b/
board/freescale/ls1046ardb/ls1046ardb.c
@@
-32,7
+32,8
@@
DECLARE_GLOBAL_DATA_PTR;
struct serial_device *default_serial_console(void)
{
#if IS_ENABLED(CONFIG_SEMIHOSTING_SERIAL)
- return &serial_smh_device;
+ if (semihosting_enabled())
+ return &serial_smh_device;
#endif
return &eserial1_device;
}