From ac37e3e2c71056a6e9be6ad69e0e67dfceeba9c2 Mon Sep 17 00:00:00 2001
From: Andy Gross <andy.gross@linaro.org>
Date: Fri, 10 Feb 2017 15:31:26 -0600
Subject: [PATCH] arm: include: Add DTS generated file to arch.h

This patch moves the include for the generated_dts_board.h inside of
the include/arch/arm/arch.h file.  This was done to simplify the
includes required for files.  Only two files will include the dts
generated include file directly: arch.h and the linker.ld

Change-Id: I2614f4fd4eeed2ab635a3264d7dac8b83f97b760
Signed-off-by: Andy Gross <andy.gross@linaro.org>
---
 arch/arm/core/cortex_m/irq_vector_table.c | 2 +-
 arch/arm/core/cortex_m/prep_c.c           | 1 -
 arch/arm/core/cortex_m/reset.S            | 1 -
 include/arch/arm/arch.h                   | 3 +++
 include/sw_isr_table.h                    | 1 -
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/core/cortex_m/irq_vector_table.c b/arch/arm/core/cortex_m/irq_vector_table.c
index e35aa791bb4..8a000c348e2 100644
--- a/arch/arm/core/cortex_m/irq_vector_table.c
+++ b/arch/arm/core/cortex_m/irq_vector_table.c
@@ -21,7 +21,7 @@
 
 #include <toolchain.h>
 #include <sections.h>
-#include <generated_dts_board.h>
+#include <arch/cpu.h>
 
 extern void _isr_wrapper(void);
 typedef void (*vth)(void); /* Vector Table Handler */
diff --git a/arch/arm/core/cortex_m/prep_c.c b/arch/arm/core/cortex_m/prep_c.c
index e7a7d1f0643..19c31d5063d 100644
--- a/arch/arm/core/cortex_m/prep_c.c
+++ b/arch/arm/core/cortex_m/prep_c.c
@@ -22,7 +22,6 @@
 #include <linker-defs.h>
 #include <nano_internal.h>
 #include <arch/arm/cortex_m/cmsis.h>
-#include <generated_dts_board.h>
 
 #ifdef CONFIG_ARMV6_M
 static inline void relocate_vector_table(void) { /* do nothing */ }
diff --git a/arch/arm/core/cortex_m/reset.S b/arch/arm/core/cortex_m/reset.S
index a6b2bd2736e..d586d2c799b 100644
--- a/arch/arm/core/cortex_m/reset.S
+++ b/arch/arm/core/cortex_m/reset.S
@@ -17,7 +17,6 @@
 #include <arch/cpu.h>
 #include <offsets_short.h>
 #include "vector_table.h"
-#include <generated_dts_board.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/include/arch/arm/arch.h b/include/arch/arm/arch.h
index ec8a2e8da6b..23b8cf30950 100644
--- a/include/arch/arm/arch.h
+++ b/include/arch/arm/arch.h
@@ -16,6 +16,9 @@
 #ifndef _ARM_ARCH__H_
 #define _ARM_ARCH__H_
 
+/* Add include for DTS generated information */
+#include <generated_dts_board.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/sw_isr_table.h b/include/sw_isr_table.h
index 51239c05b38..48fefb1476f 100644
--- a/include/sw_isr_table.h
+++ b/include/sw_isr_table.h
@@ -15,7 +15,6 @@
 #define _SW_ISR_TABLE__H_
 
 #include <arch/cpu.h>
-#include <generated_dts_board.h>
 
 #ifdef __cplusplus
 extern "C" {