1 From 09aa74a11d05763043b1925628f65a5ac0d42237 Mon Sep 17 00:00:00 2001
2 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
3 Date: Wed, 12 Jun 2013 15:42:00 -0300
4 Subject: [PATCH 055/203] ARM: mvebu: Use the preprocessor on Armada 370/XP
7 Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
8 Tested-by: Andrew Lunn <andrew@lunn.ch>
9 Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
11 arch/arm/boot/dts/armada-370-db.dts | 2 +-
12 arch/arm/boot/dts/armada-370-mirabox.dts | 2 +-
13 arch/arm/boot/dts/armada-370-rd.dts | 2 +-
14 arch/arm/boot/dts/armada-370.dtsi | 2 +-
15 arch/arm/boot/dts/armada-xp-db.dts | 2 +-
16 arch/arm/boot/dts/armada-xp-gp.dts | 2 +-
17 arch/arm/boot/dts/armada-xp-mv78260.dtsi | 2 +-
18 arch/arm/boot/dts/armada-xp-mv78460.dtsi | 2 +-
19 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 +-
20 arch/arm/boot/dts/armada-xp.dtsi | 2 +-
21 10 files changed, 10 insertions(+), 10 deletions(-)
23 --- a/arch/arm/boot/dts/armada-370-db.dts
24 +++ b/arch/arm/boot/dts/armada-370-db.dts
29 -/include/ "armada-370.dtsi"
30 +#include "armada-370.dtsi"
33 model = "Marvell Armada 370 Evaluation Board";
34 --- a/arch/arm/boot/dts/armada-370-mirabox.dts
35 +++ b/arch/arm/boot/dts/armada-370-mirabox.dts
40 -/include/ "armada-370.dtsi"
41 +#include "armada-370.dtsi"
44 model = "Globalscale Mirabox";
45 --- a/arch/arm/boot/dts/armada-370-rd.dts
46 +++ b/arch/arm/boot/dts/armada-370-rd.dts
51 -/include/ "armada-370.dtsi"
52 +#include "armada-370.dtsi"
55 model = "Marvell Armada 370 Reference Design";
56 --- a/arch/arm/boot/dts/armada-370.dtsi
57 +++ b/arch/arm/boot/dts/armada-370.dtsi
59 * common to all Armada SoCs.
62 -/include/ "armada-370-xp.dtsi"
63 +#include "armada-370-xp.dtsi"
64 /include/ "skeleton.dtsi"
67 --- a/arch/arm/boot/dts/armada-xp-db.dts
68 +++ b/arch/arm/boot/dts/armada-xp-db.dts
73 -/include/ "armada-xp-mv78460.dtsi"
74 +#include "armada-xp-mv78460.dtsi"
77 model = "Marvell Armada XP Evaluation Board";
78 --- a/arch/arm/boot/dts/armada-xp-gp.dts
79 +++ b/arch/arm/boot/dts/armada-xp-gp.dts
84 -/include/ "armada-xp-mv78460.dtsi"
85 +#include "armada-xp-mv78460.dtsi"
88 model = "Marvell Armada XP Development Board DB-MV784MP-GP";
89 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
90 +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
92 * common to all Armada XP SoCs.
95 -/include/ "armada-xp.dtsi"
96 +#include "armada-xp.dtsi"
99 model = "Marvell Armada XP MV78260 SoC";
100 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
101 +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
103 * common to all Armada XP SoCs.
106 -/include/ "armada-xp.dtsi"
107 +#include "armada-xp.dtsi"
110 model = "Marvell Armada XP MV78460 SoC";
111 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
112 +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
117 -/include/ "armada-xp-mv78260.dtsi"
118 +#include "armada-xp-mv78260.dtsi"
121 model = "PlatHome OpenBlocks AX3-4 board";
122 --- a/arch/arm/boot/dts/armada-xp.dtsi
123 +++ b/arch/arm/boot/dts/armada-xp.dtsi
125 * common to all Armada SoCs.
128 -/include/ "armada-370-xp.dtsi"
129 +#include "armada-370-xp.dtsi"
132 model = "Marvell Armada XP family SoC";