diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2015-08-12 11:25:05 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-08-19 11:28:15 +0200 |
| commit | f0600af212301ec121ba6a4afc0a91b6b21a354e (patch) | |
| tree | 2cfea695271523e32cae2f7df68e80c7f6d3bb34 | |
| parent | 739968f2adabe4b0e9eca2ad6c59dfeb89fd1e8b (diff) | |
| download | u-boot-imx-f0600af212301ec121ba6a4afc0a91b6b21a354e.zip u-boot-imx-f0600af212301ec121ba6a4afc0a91b6b21a354e.tar.gz u-boot-imx-f0600af212301ec121ba6a4afc0a91b6b21a354e.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/dts/zynq-zc770-xm010.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/zynq-zc770-xm011.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/zynq-zc770-xm012.dts | 2 | ||||
| -rw-r--r-- | 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 da3a182..680f24c 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@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 d38c820..f73c0dd 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@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 f8cc503..4289e31 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@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 436a8cd..5124cdc 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>; }; |