[U-Boot] [PATCH] ARM: dts: Rename memory at 0 to memory

Michal Simek michal.simek at xilinx.com
Wed Aug 12 12:34:08 CEST 2015


zynq-7000.dtsi include skeleton.dtsi which contains memory node with
base address and size zero. If you add memory at 0 node to the platform DTS
in final DTB there are two memory nodes and U-Boot works with the first
one (with zeros) which end up in failing in dram_init because size is
zero.
Platform memory node should rewrite default memory node setup from
skeleton.dtsi that's why platfroms needs to also use memory as node name
instead of memory at 0.

Reported-by: Siva Durga Prasad Paladugu <sivadur at xilinx.com>
Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---

 arch/arm/dts/zynq-zc770-xm010.dts | 2 +-
 arch/arm/dts/zynq-zc770-xm011.dts | 2 +-
 arch/arm/dts/zynq-zc770-xm012.dts | 2 +-
 arch/arm/dts/zynq-zc770-xm013.dts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index da3a182ea1e1..680f24c9c44d 100644
--- a/arch/arm/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/dts/zynq-zc770-xm010.dts
@@ -25,7 +25,7 @@
 		stdout-path = &uart1;
 	};
 
-	memory at 0 {
+	memory {
 		device_type = "memory";
 		reg = <0x0 0x40000000>;
 	};
diff --git a/arch/arm/dts/zynq-zc770-xm011.dts b/arch/arm/dts/zynq-zc770-xm011.dts
index d38c8201353c..f73c0ddcb8d4 100644
--- a/arch/arm/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/dts/zynq-zc770-xm011.dts
@@ -23,7 +23,7 @@
 		stdout-path = &uart1;
 	};
 
-	memory at 0 {
+	memory {
 		device_type = "memory";
 		reg = <0x0 0x40000000>;
 	};
diff --git a/arch/arm/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts
index f8cc5039d6b7..4289e31f4615 100644
--- a/arch/arm/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/dts/zynq-zc770-xm012.dts
@@ -25,7 +25,7 @@
 		stdout-path = &uart1;
 	};
 
-	memory at 0 {
+	memory {
 		device_type = "memory";
 		reg = <0x0 0x40000000>;
 	};
diff --git a/arch/arm/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts
index 436a8cd1b9a9..5124cdc5cdf0 100644
--- a/arch/arm/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/dts/zynq-zc770-xm013.dts
@@ -25,7 +25,7 @@
 		stdout-path = &uart0;
 	};
 
-	memory at 0 {
+	memory {
 		device_type = "memory";
 		reg = <0x0 0x40000000>;
 	};
-- 
2.3.5



More information about the U-Boot mailing list