From f0600af212301ec121ba6a4afc0a91b6b21a354e Mon Sep 17 00:00:00 2001 From: Michal Simek <michal.simek@xilinx.com> Date: Wed, 12 Aug 2015 11:25:05 +0200 Subject: ARM: dts: Rename memory@0 to memory zynq-7000.dtsi include skeleton.dtsi which contains memory node with base address and size zero. If you add memory@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@0. Reported-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- arch/arm/dts/zynq-zc770-xm013.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/dts/zynq-zc770-xm013.dts') diff --git a/arch/arm/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts index 436a8cd1b9..5124cdc5cd 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@0 { + memory { device_type = "memory"; reg = <0x0 0x40000000>; }; -- cgit v1.2.1