]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
ARM: dts: Rename memory@0 to memory
authorMichal Simek <michal.simek@xilinx.com>
Wed, 12 Aug 2015 09:25:05 +0000 (11:25 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Thu, 13 Aug 2015 07:49:39 +0000 (09:49 +0200)
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-afx-nand.dts
arch/arm/dts/zynq-afx-nor.dts
arch/arm/dts/zynq-afx-qspi.dts
arch/arm/dts/zynq-cc108.dts
arch/arm/dts/zynq-zc770-xm010.dts
arch/arm/dts/zynq-zc770-xm011.dts
arch/arm/dts/zynq-zc770-xm012.dts
arch/arm/dts/zynq-zc770-xm013.dts

index cbb56a697930ef68656264405f0eb43c2a710c64..5587c008769b5d72947f89111b3388c0c04b4a3f 100644 (file)
@@ -28,7 +28,7 @@
                stdout-path = &uart1;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x8000000>;
        };
index 3c79ae384ca2cd1b58e51780242647241a855f8b..5af5630bf5d530645d5bc50d4dd30ccacd224a2a 100644 (file)
@@ -28,7 +28,7 @@
                stdout-path = &uart1;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x8000000>;
        };
index 9c2f9d7e89951f449af24e5eb4f8def9b2873e21..7e8d2d56d14cb3fe9754acce4f2fd3d9a131677f 100644 (file)
@@ -29,7 +29,7 @@
                stdout-path = &uart1;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x8000000>;
        };
index 038cb5773c2210859fe4787c7db5ca64a0c23b54..49f2547730379da2b369a45e72e311773ea8a0b9 100644 (file)
@@ -30,7 +30,7 @@
                stdout-path = &uart1;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x20000000>;
        };
index 61c7fd7c5dd6c9b70e14b1c44c9a182f61ed7b62..c20e7f441913df07626c1974f7e98a3d7764cb38 100644 (file)
@@ -26,7 +26,7 @@
                stdout-path = &uart1;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };
index cf54113f3f91abae7efdeea98e7c0b601c36ebbc..8be3c958b8a1e3ae5072561859e3d0e51f64f14f 100644 (file)
@@ -23,7 +23,7 @@
                stdout-path = &uart1;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };
index 82a0005ad2b06b6cbf9d23f286fb6a9d418c10dc..5d1c4cd4765c2bd727c1342af2ce6d00197010c2 100644 (file)
@@ -25,7 +25,7 @@
                stdout-path = &uart1;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };
index a6e89be3921d482103eb7d78541ff0fe74e9f20a..77ba5bc95293959f68dd017eaf559aa7847fd4b4 100644 (file)
@@ -26,7 +26,7 @@
                stdout-path = &uart0;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };