diff options
author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2013-07-26 09:17:56 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-08-06 10:11:08 -0400 |
commit | 38149887ef8bfdc3d95e84a5b0a344241787d2d7 (patch) | |
tree | 3db00dbeec9da41c4c51852fe1de796199f103e5 /arch/arm/boot/dts | |
parent | b9ae0b50e652b3f6c0df3ab9da7acb7501d3d656 (diff) |
ARM: mvebu: Use the preprocessor on Armada 370/XP device tree files
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r-- | arch/arm/boot/dts/armada-370-db.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-370-mirabox.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-370-rd.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-db.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-gp.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78260.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78460.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts index beee1699d49e..55b986cc4356 100644 --- a/arch/arm/boot/dts/armada-370-db.dts +++ b/arch/arm/boot/dts/armada-370-db.dts | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | /dts-v1/; | 16 | /dts-v1/; |
17 | /include/ "armada-370.dtsi" | 17 | #include "armada-370.dtsi" |
18 | 18 | ||
19 | / { | 19 | / { |
20 | model = "Marvell Armada 370 Evaluation Board"; | 20 | model = "Marvell Armada 370 Evaluation Board"; |
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts index 45b107763e3b..37530afd8af0 100644 --- a/arch/arm/boot/dts/armada-370-mirabox.dts +++ b/arch/arm/boot/dts/armada-370-mirabox.dts | |||
@@ -9,7 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | /dts-v1/; | 11 | /dts-v1/; |
12 | /include/ "armada-370.dtsi" | 12 | #include "armada-370.dtsi" |
13 | 13 | ||
14 | / { | 14 | / { |
15 | model = "Globalscale Mirabox"; | 15 | model = "Globalscale Mirabox"; |
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts index a3a2fedb8726..7aa2171fbc76 100644 --- a/arch/arm/boot/dts/armada-370-rd.dts +++ b/arch/arm/boot/dts/armada-370-rd.dts | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | /dts-v1/; | 14 | /dts-v1/; |
15 | /include/ "armada-370.dtsi" | 15 | #include "armada-370.dtsi" |
16 | 16 | ||
17 | / { | 17 | / { |
18 | model = "Marvell Armada 370 Reference Design"; | 18 | model = "Marvell Armada 370 Reference Design"; |
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index fa3dfc6b4c6a..08ec6e3a9c7a 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi | |||
@@ -15,7 +15,7 @@ | |||
15 | * common to all Armada SoCs. | 15 | * common to all Armada SoCs. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | /include/ "armada-370-xp.dtsi" | 18 | #include "armada-370-xp.dtsi" |
19 | /include/ "skeleton.dtsi" | 19 | /include/ "skeleton.dtsi" |
20 | 20 | ||
21 | / { | 21 | / { |
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts index e28e68ff864d..a9bd766c5324 100644 --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | /dts-v1/; | 16 | /dts-v1/; |
17 | /include/ "armada-xp-mv78460.dtsi" | 17 | #include "armada-xp-mv78460.dtsi" |
18 | 18 | ||
19 | / { | 19 | / { |
20 | model = "Marvell Armada XP Evaluation Board"; | 20 | model = "Marvell Armada XP Evaluation Board"; |
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts index c87b2de29c30..54843e5a049f 100644 --- a/arch/arm/boot/dts/armada-xp-gp.dts +++ b/arch/arm/boot/dts/armada-xp-gp.dts | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | /dts-v1/; | 16 | /dts-v1/; |
17 | /include/ "armada-xp-mv78460.dtsi" | 17 | #include "armada-xp-mv78460.dtsi" |
18 | 18 | ||
19 | / { | 19 | / { |
20 | model = "Marvell Armada XP Development Board DB-MV784MP-GP"; | 20 | model = "Marvell Armada XP Development Board DB-MV784MP-GP"; |
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index 2d9335da210c..985373a04561 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi | |||
@@ -13,7 +13,7 @@ | |||
13 | * common to all Armada XP SoCs. | 13 | * common to all Armada XP SoCs. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | /include/ "armada-xp.dtsi" | 16 | #include "armada-xp.dtsi" |
17 | 17 | ||
18 | / { | 18 | / { |
19 | model = "Marvell Armada XP MV78260 SoC"; | 19 | model = "Marvell Armada XP MV78260 SoC"; |
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index c7b1f4d5c1c7..f8bf25a20a71 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi | |||
@@ -13,7 +13,7 @@ | |||
13 | * common to all Armada XP SoCs. | 13 | * common to all Armada XP SoCs. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | /include/ "armada-xp.dtsi" | 16 | #include "armada-xp.dtsi" |
17 | 17 | ||
18 | / { | 18 | / { |
19 | model = "Marvell Armada XP MV78460 SoC"; | 19 | model = "Marvell Armada XP MV78460 SoC"; |
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index 8f510458ea86..d090264d81dd 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | |||
@@ -11,7 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | /dts-v1/; | 13 | /dts-v1/; |
14 | /include/ "armada-xp-mv78260.dtsi" | 14 | #include "armada-xp-mv78260.dtsi" |
15 | 15 | ||
16 | / { | 16 | / { |
17 | model = "PlatHome OpenBlocks AX3-4 board"; | 17 | model = "PlatHome OpenBlocks AX3-4 board"; |
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 416eb9481844..8c07bfe21ee8 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
@@ -16,7 +16,7 @@ | |||
16 | * common to all Armada SoCs. | 16 | * common to all Armada SoCs. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | /include/ "armada-370-xp.dtsi" | 19 | #include "armada-370-xp.dtsi" |
20 | 20 | ||
21 | / { | 21 | / { |
22 | model = "Marvell Armada XP family SoC"; | 22 | model = "Marvell Armada XP family SoC"; |