projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-atmel
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
uniphier-ph1-pro5-4kbox.dts
diff --git
a/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
b/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
index 912bc27beaabfb8619fe59cb81c05429113509d8..d46e827280992aa01dee616a611cf16b8546e16e 100644
(file)
--- a/
arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
+++ b/
arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
@@
-19,8
+19,7
@@
};
chosen {
- bootargs = "console=ttyS1,115200";
- stdout-path = &serial1;
+ stdout-path = "serial1:115200n8";
};
aliases {
@@
-44,6
+43,10
@@
status = "okay";
};
+&usb1 {
+ status = "okay";
+};
+
/* for U-boot only */
/ {
soc {