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
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
socfpga_cyclone5_de0_nano_soc-u-boot.dtsi
diff --git
a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc-u-boot.dtsi
b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc-u-boot.dtsi
index 08d81da16907f18d79b808fe539251442b659329..0219c6948d4f4a600a0756db3b69aa72564d8a13 100644
(file)
--- a/
arch/arm/dts/socfpga_cyclone5_de0_nano_soc-u-boot.dtsi
+++ b/
arch/arm/dts/socfpga_cyclone5_de0_nano_soc-u-boot.dtsi
@@
-6,14
+6,12
@@
* Copyright (c) 2018 Simon Goldschmidt
*/
+#include "socfpga-common-u-boot.dtsi"
+
/{
aliases {
udc0 = &usb1;
};
-
- soc {
- u-boot,dm-pre-reloc;
- };
};
&watchdog0 {