Tegra: fdt: Change /include/ to #include for C preprocessor

dts Makefile has the arch & board include paths added to DTS_CPPFLAGS. This allows the use of '#include "xyz"' in the dts/dtsi file which helps the C preprocessor find common dtsi include files. Signed-off-by: Tom Warren <twarren@nvidia.com> Reviewed-by: Stephen Warren <swarren@nvidia.com>
11 years ago · 6c5be646b4
parent a7f8b5e616
commit 6c5be646b4
16 changed files with 17 additions and 16 deletions
--- a/arch/arm/dts/tegra114.dtsi
+++ b/arch/arm/dts/tegra114.dtsi
@ -1,4 +1,4 @@
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"

 / {
 	compatible = "nvidia,tegra114";
--- a/arch/arm/dts/tegra20.dtsi
+++ b/arch/arm/dts/tegra20.dtsi
@ -1,4 +1,4 @@
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"

 / {
 	compatible = "nvidia,tegra20";
--- a/arch/arm/dts/tegra30.dtsi
+++ b/arch/arm/dts/tegra30.dtsi
@ -1,4 +1,4 @@
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"

 / {
 	compatible = "nvidia,tegra30";
--- a/board/avionic-design/dts/tegra20-medcom-wide.dts
+++ b/board/avionic-design/dts/tegra20-medcom-wide.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ ARCH_CPU_DTS
+#include "tegra20.dtsi"

 / {
 	model = "Avionic Design Medcom-Wide";
--- a/board/avionic-design/dts/tegra20-plutux.dts
+++ b/board/avionic-design/dts/tegra20-plutux.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ ARCH_CPU_DTS
+#include "tegra20.dtsi"

 / {
 	model = "Avionic Design Plutux";
--- a/board/avionic-design/dts/tegra20-tec.dts
+++ b/board/avionic-design/dts/tegra20-tec.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ ARCH_CPU_DTS
+#include "tegra20.dtsi"

 / {
 	model = "Avionic Design Tamonten Evaluation Carrier";
--- a/board/compal/dts/tegra20-paz00.dts
+++ b/board/compal/dts/tegra20-paz00.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ ARCH_CPU_DTS
+#include "tegra20.dtsi"

 / {
        model = "Toshiba AC100 / Dynabook AZ";
--- a/board/compulab/dts/tegra20-trimslice.dts
+++ b/board/compulab/dts/tegra20-trimslice.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ ARCH_CPU_DTS
+#include "tegra20.dtsi"

 / {
 	model = "Compulab TrimSlice board";
--- a/board/nvidia/dts/tegra114-dalmore.dts
+++ b/board/nvidia/dts/tegra114-dalmore.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ ARCH_CPU_DTS
+#include ARCH_CPU_DTS

 / {
 	model = "NVIDIA Dalmore";
--- a/board/nvidia/dts/tegra20-harmony.dts
+++ b/board/nvidia/dts/tegra20-harmony.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ ARCH_CPU_DTS
+#include "tegra20.dtsi"

 / {
 	model = "NVIDIA Tegra20 Harmony evaluation board";
--- a/board/nvidia/dts/tegra20-seaboard.dts
+++ b/board/nvidia/dts/tegra20-seaboard.dts
@ -1,7 +1,7 @@
 /dts-v1/;

 /memreserve/ 0x1c000000 0x04000000;
-/include/ ARCH_CPU_DTS
+#include "tegra20.dtsi"

 / {
 	model = "NVIDIA Seaboard";
--- a/board/nvidia/dts/tegra20-ventana.dts
+++ b/board/nvidia/dts/tegra20-ventana.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ ARCH_CPU_DTS
+#include "tegra20.dtsi"

 / {
 	model = "NVIDIA Tegra20 Ventana evaluation board";
--- a/board/nvidia/dts/tegra20-whistler.dts
+++ b/board/nvidia/dts/tegra20-whistler.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ ARCH_CPU_DTS
+#include "tegra20.dtsi"

 / {
 	model = "NVIDIA Tegra20 Whistler evaluation board";
--- a/board/nvidia/dts/tegra30-cardhu.dts
+++ b/board/nvidia/dts/tegra30-cardhu.dts
@ -1,7 +1,7 @@
 /dts-v1/;

 /memreserve/ 0x1c000000 0x04000000;
-/include/ ARCH_CPU_DTS
+#include ARCH_CPU_DTS

 / {
 	model = "NVIDIA Cardhu";
--- a/board/toradex/dts/tegra20-colibri_t20_iris.dts
+++ b/board/toradex/dts/tegra20-colibri_t20_iris.dts
@ -1,6 +1,6 @@
 /dts-v1/;

-/include/ ARCH_CPU_DTS
+#include "tegra20.dtsi"

 / {
 	model = "Toradex Colibri T20";
--- a/dts/Makefile
+++ b/dts/Makefile
@ -38,7 +38,8 @@ Please define CONFIG_ARCH_DEVICE_TREE))
 # We preprocess the device tree file provide a useful define
 DTS_CPPFLAGS := -x assembler-with-cpp \
 		-DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\" \
-		-DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\"
+		-DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\" \
+		-I$(SRCTREE)/board/$(VENDOR)/dts -I$(SRCTREE)/arch/$(ARCH)/dts

 all:	$(obj).depend $(LIB)