ARM: dts: uniphier: move memory node below aliases node

These UniPhier DT files are fine as long as they are compiled in the
Linux build system.  It is true that Linux is the biggest user of
DT, but DT is project neutral from its concept.  DT files are often
re-used for other projects.  Especially for the UniPhier platform,
these DT files are re-used for U-Boot as well.

If I feed these DT files to the FDTGREP tool in U-Boot, it complains
about the node order.

  FDTGREP spl/u-boot-spl.dtb
  Error at 'fdt_find_regions': FDT_ERR_BADLAYOUT
  /aliases node must come before all other nodes

Given that DT is not very sensitive to the order of nodes, this is a
problem of FDTGREP.  I filed a bug report a year ago, but it has not
been fixed yet.

Differentiating DT is painful.  So, I am up-streaming the requirement
from the down-stream project.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2017-03-11 22:52:59 +09:00
parent 2201c7f10d
commit 23866a3def
9 changed files with 46 additions and 46 deletions

View File

@ -52,11 +52,6 @@
model = "UniPhier LD4 Reference Board";
compatible = "socionext,uniphier-ld4-ref", "socionext,uniphier-ld4";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -71,6 +66,11 @@
i2c2 = &i2c2;
i2c3 = &i2c3;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};
&ethsc {

View File

@ -52,11 +52,6 @@
model = "UniPhier LD6b Reference Board";
compatible = "socionext,uniphier-ld6b-ref", "socionext,uniphier-ld6b";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -73,6 +68,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&ethsc {

View File

@ -50,11 +50,6 @@
model = "UniPhier Pro4 Ace Board";
compatible = "socionext,uniphier-pro4-ace", "socionext,uniphier-pro4";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -70,6 +65,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};
&serial0 {

View File

@ -52,11 +52,6 @@
model = "UniPhier Pro4 Reference Board";
compatible = "socionext,uniphier-pro4-ref", "socionext,uniphier-pro4";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -73,6 +68,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};
&ethsc {

View File

@ -50,11 +50,6 @@
model = "UniPhier Pro4 Sanji Board";
compatible = "socionext,uniphier-pro4-sanji", "socionext,uniphier-pro4";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -69,6 +64,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&serial0 {

View File

@ -51,11 +51,6 @@
compatible = "socionext,uniphier-pxs2-gentil",
"socionext,uniphier-pxs2";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -70,6 +65,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&serial2 {

View File

@ -50,11 +50,6 @@
model = "UniPhier PXs2 Vodka Board";
compatible = "socionext,uniphier-pxs2-vodka", "socionext,uniphier-pxs2";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -68,6 +63,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&serial2 {

View File

@ -52,12 +52,6 @@
model = "UniPhier sLD3 Reference Board";
compatible = "socionext,uniphier-sld3-ref", "socionext,uniphier-sld3";
memory@8000000 {
device_type = "memory";
reg = <0x80000000 0x20000000
0xc0000000 0x20000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -72,6 +66,12 @@
i2c3 = &i2c3;
i2c4 = &i2c4;
};
memory@8000000 {
device_type = "memory";
reg = <0x80000000 0x20000000
0xc0000000 0x20000000>;
};
};
&ethsc {

View File

@ -52,11 +52,6 @@
model = "UniPhier sLD8 Reference Board";
compatible = "socionext,uniphier-sld8-ref", "socionext,uniphier-sld8";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -71,6 +66,11 @@
i2c2 = &i2c2;
i2c3 = &i2c3;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};
&ethsc {