From 2f803e02e82188d851e1dde444f34ba6dc62aadf Mon Sep 17 00:00:00 2001
From: Fabio Utzig <utzig@apache.org>
Date: Fri, 9 Mar 2018 09:22:01 -0300
Subject: [PATCH] Move cmsis_nvic.h files frm BSP to MCU

This moves cmsis_nvic.h from BSPs to MCUs. Where customizations where
necessary, new syscfg options were added to the MCU to be overridden by
the BSP, eg, number of peripheral interrupts.

X-Original-Commit: a926c9c1025087967f113235c4fe7cd5ee6a8dc2
---
 nimble/drivers/nrf51/src/ble_hw.c  | 2 +-
 nimble/drivers/nrf51/src/ble_phy.c | 2 +-
 nimble/drivers/nrf52/src/ble_hw.c  | 2 +-
 nimble/drivers/nrf52/src/ble_phy.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nimble/drivers/nrf51/src/ble_hw.c b/nimble/drivers/nrf51/src/ble_hw.c
index e9b50408f..5c30275a5 100644
--- a/nimble/drivers/nrf51/src/ble_hw.c
+++ b/nimble/drivers/nrf51/src/ble_hw.c
@@ -27,7 +27,7 @@
 #include "nimble/nimble_opt.h"
 #include "nrf51_bitfields.h"
 #include "controller/ble_hw.h"
-#include "bsp/cmsis_nvic.h"
+#include "mcu/cmsis_nvic.h"
 
 /* Total number of resolving list elements */
 #define BLE_HW_RESOLV_LIST_SIZE     (16)
diff --git a/nimble/drivers/nrf51/src/ble_phy.c b/nimble/drivers/nrf51/src/ble_phy.c
index e22257b26..ba5130834 100644
--- a/nimble/drivers/nrf51/src/ble_phy.c
+++ b/nimble/drivers/nrf51/src/ble_phy.c
@@ -23,7 +23,7 @@
 #include "syscfg/syscfg.h"
 #include "os/os.h"
 #include "ble/xcvr.h"
-#include "bsp/cmsis_nvic.h"
+#include "mcu/cmsis_nvic.h"
 #include "nimble/ble.h"
 #include "nimble/nimble_opt.h"
 #include "controller/ble_phy.h"
diff --git a/nimble/drivers/nrf52/src/ble_hw.c b/nimble/drivers/nrf52/src/ble_hw.c
index e63ba52e0..57d1402ea 100644
--- a/nimble/drivers/nrf52/src/ble_hw.c
+++ b/nimble/drivers/nrf52/src/ble_hw.c
@@ -27,7 +27,7 @@
 #include "nimble/nimble_opt.h"
 #include "nrf52_bitfields.h"
 #include "controller/ble_hw.h"
-#include "bsp/cmsis_nvic.h"
+#include "mcu/cmsis_nvic.h"
 #include "os/os_trace_api.h"
 
 /* Total number of resolving list elements */
diff --git a/nimble/drivers/nrf52/src/ble_phy.c b/nimble/drivers/nrf52/src/ble_phy.c
index 85909293a..7f478b6b8 100644
--- a/nimble/drivers/nrf52/src/ble_phy.c
+++ b/nimble/drivers/nrf52/src/ble_phy.c
@@ -23,7 +23,7 @@
 #include "syscfg/syscfg.h"
 #include "os/os.h"
 #include "ble/xcvr.h"
-#include "bsp/cmsis_nvic.h"
+#include "mcu/cmsis_nvic.h"
 #include "hal/hal_gpio.h"
 #include "nimble/ble.h"
 #include "nimble/nimble_opt.h"