soc: nordic: Include <nrfx.h> instead of <nrf.h> from <soc.h>

anangl · ioannisg · commit c24c463328c1 · 2019-09-24T16:20:16.000+02:00
This change is done so that there is no need to additionaly include
&lt;nrfx.h&gt; before &lt;soc/nrfx_coredep.h&gt; (what might be a bit surprising)
and so that &lt;nrfx_config.h&gt; doesn't need to be include separately for
nRF SoCs requiring a special mapping of peripheral accessing symbols.

This commit removes also no longer needed inclusions and updates
the hal_nordic module with required minor correction of nrfx_glue.h.

Signed-off-by: Andrzej Głąbek &lt;andrzej.glabek@nordicsemi.no&gt;
diff --git a/drivers/sensor/nrf5/temp_nrf5.c b/drivers/sensor/nrf5/temp_nrf5.c
@@ -13,8 +13,6 @@
 
 LOG_MODULE_REGISTER(temp_nrf5, CONFIG_SENSOR_LOG_LEVEL);
 
-#include "nrf.h"
-
 
 /* The nRF5 temperature device returns measurements in 0.25C
  * increments.  Scale to mDegrees C.
diff --git a/samples/boards/nrf52/mesh/onoff-app/src/main.c b/samples/boards/nrf52/mesh/onoff-app/src/main.c
@@ -39,7 +39,6 @@
 #include <sys/printk.h>
 #include <settings/settings.h>
 #include <sys/byteorder.h>
-#include <nrf.h>
 #include <device.h>
 #include <drivers/gpio.h>
 #include <bluetooth/bluetooth.h>
diff --git a/soc/arm/nordic_nrf/nrf51/soc.c b/soc/arm/nordic_nrf/nrf51/soc.c
@@ -15,7 +15,6 @@
 
 #include <kernel.h>
 #include <init.h>
-#include <nrfx.h>
 #include <hal/nrf_power.h>
 #include <soc/nrfx_coredep.h>
 #include <logging/log.h>
diff --git a/soc/arm/nordic_nrf/nrf51/soc.h b/soc/arm/nordic_nrf/nrf51/soc.h
@@ -14,7 +14,7 @@
 #ifndef _ASMLANGUAGE
 
 #include <nrf_common.h>
-#include <nrf.h>
+#include <nrfx.h>
 
 /* Add include for DTS generated information */
 #include <generated_dts_board.h>
diff --git a/soc/arm/nordic_nrf/nrf52/soc.c b/soc/arm/nordic_nrf/nrf52/soc.c
@@ -15,7 +15,6 @@
 #include <kernel.h>
 #include <init.h>
 #include <cortex_m/exc.h>
-#include <nrfx.h>
 #include <hal/nrf_power.h>
 #include <soc/nrfx_coredep.h>
 #include <logging/log.h>
diff --git a/soc/arm/nordic_nrf/nrf52/soc.h b/soc/arm/nordic_nrf/nrf52/soc.h
@@ -14,7 +14,7 @@
 #ifndef _ASMLANGUAGE
 
 #include <nrf_common.h>
-#include <nrf.h>
+#include <nrfx.h>
 
 /* Add include for DTS generated information */
 #include <generated_dts_board.h>
diff --git a/soc/arm/nordic_nrf/nrf91/soc.c b/soc/arm/nordic_nrf/nrf91/soc.c
@@ -15,7 +15,6 @@
 #include <kernel.h>
 #include <init.h>
 #include <cortex_m/exc.h>
-#include <nrfx.h>
 #include <soc/nrfx_coredep.h>
 #include <logging/log.h>
 
diff --git a/soc/arm/nordic_nrf/nrf91/soc.h b/soc/arm/nordic_nrf/nrf91/soc.h
@@ -13,14 +13,11 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <nrf.h>
+#include <nrfx.h>
 
 /* Add include for DTS generated information */
 #include <generated_dts_board.h>
 
-/* Add include for peripheral base address mappings */
-#include <nrfx_config.h>
-
 #endif /* !_ASMLANGUAGE */
 
 #define FLASH_PAGE_ERASE_MAX_TIME_US 	89700UL
diff --git a/west.yml b/west.yml
@@ -44,7 +44,7 @@ manifest:
       revision: a12d92816a53a521d79cefcf5c38b9dc8a4fed6e
       path: modules/hal/cypress
     - name: hal_nordic
-      revision: 6a4181a794e71fbf6e9a7c857aaff8e2e7a9602f
+      revision: db6277a1266cbcbd5588959bbacc1cd5670aed0e
       path: modules/hal/nordic
     - name: hal_openisa
       revision: be5c01f86c96500def5079bcc58d2baefdffb6c8
