From c8ffde664745efccc4c67e598fd242deca047946 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 19 Mar 2019 14:13:45 -0600
Subject: [PATCH] arch/arm:  Fix more errors resulting from universal cache
 interfaces.  The old cache-specific head file also provided a sneak way to
 include other necessary header files.  With the old cache.h removed, those
 files all fail to build.

---
 arch/arm/src/nrf52/nrf52_nvmc.c    | 1 +
 arch/arm/src/stm32f7/stm32_start.c | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/src/nrf52/nrf52_nvmc.c b/arch/arm/src/nrf52/nrf52_nvmc.c
index 9c17f048fe8..dfa273bf8f2 100644
--- a/arch/arm/src/nrf52/nrf52_nvmc.c
+++ b/arch/arm/src/nrf52/nrf52_nvmc.c
@@ -45,6 +45,7 @@
 #include <nuttx/config.h>
 #include <stdbool.h>
 
+#include "up_arch.h"
 #include "barriers.h"
 
 #include "chip/nrf52_ficr.h"
diff --git a/arch/arm/src/stm32f7/stm32_start.c b/arch/arm/src/stm32f7/stm32_start.c
index 8b158b7e4f1..d3ceac74e4b 100644
--- a/arch/arm/src/stm32f7/stm32_start.c
+++ b/arch/arm/src/stm32f7/stm32_start.c
@@ -49,12 +49,9 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
+#include "nvic.h"
 #include "barriers.h"
 
-#ifdef CONFIG_ARCH_FPU
-#  include "nvic.h"
-#endif
-
 #include "stm32_rcc.h"
 #include "stm32_userspace.h"
 #include "stm32_lowputc.h"