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_de1_soc.dts
diff --git
a/arch/arm/dts/socfpga_cyclone5_de1_soc.dts
b/arch/arm/dts/socfpga_cyclone5_de1_soc.dts
index 4f076bce93ebd8c1e9b2e71c1bfef312f120516b..ff1e61e0cbe9ed87b1231137deb6595af987ea36 100644
(file)
--- a/
arch/arm/dts/socfpga_cyclone5_de1_soc.dts
+++ b/
arch/arm/dts/socfpga_cyclone5_de1_soc.dts
@@
-4,6
+4,7
@@
*/
#include "socfpga_cyclone5.dtsi"
+#include "socfpga-common-u-boot.dtsi"
/ {
model = "Terasic DE1-SoC";
@@
-24,10
+25,6
@@
device_type = "memory";
reg = <0x0 0x40000000>; /* 1GB */
};
-
- soc {
- u-boot,dm-pre-reloc;
- };
};
&gmac1 {