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

This change is done so that there is no need to additionaly include
<nrfx.h> before <soc/nrfx_coredep.h> (what might be a bit surprising)
and so that <nrfx_config.h> 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 <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2019-09-19 13:34:17 +02:00 committed by Ioannis Glaropoulos
commit c24c463328
9 changed files with 4 additions and 13 deletions

View file

@ -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.

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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

View file

@ -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