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 'agust@denx.de' of git://git.denx.de/u-boot-staging
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
uniphier-ph1-sld8-ref.dts
diff --git
a/arch/arm/dts/uniphier-ph1-sld8-ref.dts
b/arch/arm/dts/uniphier-ph1-sld8-ref.dts
index 6269f9afd32a7c8282f13dc742386b7efe6e93f7..b5b6f65d3697d65667ffb0a6a9b18eae0d6fd357 100644
(file)
--- a/
arch/arm/dts/uniphier-ph1-sld8-ref.dts
+++ b/
arch/arm/dts/uniphier-ph1-sld8-ref.dts
@@
-20,8
+20,7
@@
};
chosen {
};
chosen {
- bootargs = "console=ttyS0,115200";
- stdout-path = &serial0;
+ stdout-path = "serial0:115200n8";
};
aliases {
};
aliases {
@@
-64,7
+63,21
@@
status = "okay";
};
status = "okay";
};
-/* for U-boot only */
+/* for U-Boot only */
+/ {
+ soc {
+ u-boot,dm-pre-reloc;
+ };
+};
+
&serial0 {
&serial0 {
- u-boot,dm-pre-reloc;
+ u-boot,dm-pre-reloc;
+};
+
+&pinctrl {
+ u-boot,dm-pre-reloc;
+};
+
+&pinctrl_uart0 {
+ u-boot,dm-pre-reloc;
};
};