summaryrefslogtreecommitdiff
path: root/arch/arm/dts/uniphier-ph1-ld11-ref.dts
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-04-21 14:43:14 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-04-24 09:53:56 +0900
commit6c64d50e47cbb9f68f53cc67f178d1a09f63b369 (patch)
tree3f3a3ffbc699445d16bd271a9a7be617704215c8 /arch/arm/dts/uniphier-ph1-ld11-ref.dts
parent1222addb3f7077309c5fc13b75bf7d1f40bec549 (diff)
downloadu-boot-imx-6c64d50e47cbb9f68f53cc67f178d1a09f63b369.zip
u-boot-imx-6c64d50e47cbb9f68f53cc67f178d1a09f63b369.tar.gz
u-boot-imx-6c64d50e47cbb9f68f53cc67f178d1a09f63b369.tar.bz2
ARM: dts: uniphier: move aliases node up to satisfy fdtgrep
Currently, fdtgrep would not accept uniphier-ph1-ld20-ref.dtb and uniphier-ph1-ld11-ref.dtb unless the aliases node comes the first in the root node. $ make -s uniphier_pxs2_ld6b_defconfig $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ph1-ld20-ref [snip] LDS spl/u-boot-spl.lds LD spl/u-boot-spl OBJCOPY spl/u-boot-spl-nodtb.bin FDTGREP spl/u-boot-spl.dtb Error at 'fdt_find_regions': FDT_ERR_BADLAYOUT /aliases node must come before all other nodes Error: FDT_ERR_BADMAGIC make[1]: *** [spl/u-boot-spl.dtb] Error 1 make: *** [spl/u-boot-spl] Error 2 This commit moves the aliases node as the error message from the fdtgrep tool suggests, although this requirement does not sound reasonable to me. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/dts/uniphier-ph1-ld11-ref.dts')
-rw-r--r--arch/arm/dts/uniphier-ph1-ld11-ref.dts18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/dts/uniphier-ph1-ld11-ref.dts b/arch/arm/dts/uniphier-ph1-ld11-ref.dts
index a624a49..88e7f53 100644
--- a/arch/arm/dts/uniphier-ph1-ld11-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld11-ref.dts
@@ -14,15 +14,6 @@
model = "UniPhier PH1-LD11 Reference Board";
compatible = "socionext,ph1-ld11-ref", "socionext,ph1-ld11";
- memory {
- device_type = "memory";
- reg = <0 0x80000000 0 0x40000000>;
- };
-
- chosen {
- stdout-path = "serial0:115200n8";
- };
-
aliases {
serial0 = &serial0;
serial1 = &serial1;
@@ -35,6 +26,15 @@
i2c4 = &i2c4;
i2c5 = &i2c5;
};
+
+ memory {
+ device_type = "memory";
+ reg = <0 0x80000000 0 0x40000000>;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
};
&ethsc {