From a0fbc88c1aa9c94dc9de0dd105730abb084ea1fc Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Mon, 3 Apr 2017 16:35:53 -0500
Subject: [PATCH] arm: dts: Move common arm includes into a dts system include

Introduce a system include so that board dts files are able to live in
any location and properly include the things they need.

Change-Id: Icd26433117a4ca9726aeb74eec9f72c6d9df617c
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 dts/arm/cc32xx_launchxl.dtsi | 2 +-
 dts/arm/nxp_k6x.dtsi         | 2 +-
 dts/arm/nxp_kw41z.dtsi       | 2 +-
 dts/arm/stm32f103xb.dtsi     | 2 +-
 dts/arm/stm32l476.dtsi       | 2 +-
 dts/arm/v2m_beetle.dts       | 2 +-
 scripts/Makefile.lib         | 2 ++
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dts/arm/cc32xx_launchxl.dtsi b/dts/arm/cc32xx_launchxl.dtsi
index 950f3131c14..a97361ccef4 100644
--- a/dts/arm/cc32xx_launchxl.dtsi
+++ b/dts/arm/cc32xx_launchxl.dtsi
@@ -1,4 +1,4 @@
-#include "armv7-m.dtsi"
+#include <arm/armv7-m.dtsi>
 #include <inc/hw_memmap.h>
 #include <inc/hw_ints.h>
 
diff --git a/dts/arm/nxp_k6x.dtsi b/dts/arm/nxp_k6x.dtsi
index 8bf600da6cd..892dc80f655 100644
--- a/dts/arm/nxp_k6x.dtsi
+++ b/dts/arm/nxp_k6x.dtsi
@@ -1,4 +1,4 @@
-#include "armv7-m.dtsi"
+#include <arm/armv7-m.dtsi>
 
 / {
 	cpus {
diff --git a/dts/arm/nxp_kw41z.dtsi b/dts/arm/nxp_kw41z.dtsi
index cc166feb5db..e6aff70ba30 100644
--- a/dts/arm/nxp_kw41z.dtsi
+++ b/dts/arm/nxp_kw41z.dtsi
@@ -1,4 +1,4 @@
-#include "armv6-m.dtsi"
+#include <arm/armv6-m.dtsi>
 
 / {
 	cpus {
diff --git a/dts/arm/stm32f103xb.dtsi b/dts/arm/stm32f103xb.dtsi
index 003d7719f4d..866eb7cd7f0 100644
--- a/dts/arm/stm32f103xb.dtsi
+++ b/dts/arm/stm32f103xb.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "armv7-m.dtsi"
+#include <arm/armv7-m.dtsi>
 
 / {
 	sram0: memory {
diff --git a/dts/arm/stm32l476.dtsi b/dts/arm/stm32l476.dtsi
index 107ae4364ff..4ac894c6b1e 100644
--- a/dts/arm/stm32l476.dtsi
+++ b/dts/arm/stm32l476.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "armv7-m.dtsi"
+#include <arm/armv7-m.dtsi>
 
 / {
 
diff --git a/dts/arm/v2m_beetle.dts b/dts/arm/v2m_beetle.dts
index 08916163364..6296de35a4a 100644
--- a/dts/arm/v2m_beetle.dts
+++ b/dts/arm/v2m_beetle.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "armv7-m.dtsi"
+#include <arm/armv7-m.dtsi>
 #include "arm/beetle/soc_irq.h"
 
 / {
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 319bd598b7f..66a0af4350c 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -156,6 +156,8 @@ dtc_cpp_flags  = -Wp,-MD,$(depfile).pre.tmp -nostdinc                    \
 		 $(ZEPHYRINCLUDE)                                        \
 		 -I$(srctree)/arch/$(ARCH)/soc				 \
 		 -I$(srctree)/dts/common				 \
+		 -I$(srctree)/dts					 \
+		 -I$(srctree)/dts/$(ARCH)				 \
 		 -I$(srctree)/drivers/of/testcase-data                   \
 		 -undef -D__DTS__