Skip to content

treewide: align to modified include paths in nrfx #3355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: collab-nrfx-4.0
Choose a base branch
from
+231 −977
Open

treewide: align to modified include paths in nrfx #3355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10dd191
modules: hal_nordic: nrfx: align to include cleanup
masz-nordic Oct 3, 2025
6c1fe57
treewide: align to nrfx paths rework
masz-nordic Oct 3, 2025
4240301
[nrf noup] modules: hal_nordic: cleanup nrfx_config
masz-nordic Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/native/nrf_bsim/soc/soc_secure.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


#include <stdint.h>
#include <nrf.h>
#include <nrfx.h>
#include <hal/nrf_ficr.h>

static inline void soc_secure_read_deviceid(uint32_t deviceid[2])
Expand Down
1 change: 0 additions & 1 deletion drivers/clock_control/clock_control_nrf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <zephyr/logging/log.h>
#include <zephyr/shell/shell.h>
#include <zephyr/irq.h>
#include <nrf_erratas.h>

LOG_MODULE_REGISTER(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);

Expand Down
1 change: 0 additions & 1 deletion drivers/flash/nrf_qspi_nor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ LOG_MODULE_REGISTER(qspi_nor, CONFIG_FLASH_LOG_LEVEL);
#include "spi_nor.h"
#include "jesd216.h"
#include "flash_priv.h"
#include <nrf_erratas.h>
#include <nrfx_qspi.h>
#include <hal/nrf_clock.h>
#include <hal/nrf_gpio.h>
Expand Down
1 change: 0 additions & 1 deletion drivers/flash/soc_flash_nrf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <zephyr/drivers/flash.h>
#include <string.h>
#include <nrfx_nvmc.h>
#include <nrf_erratas.h>

#include "soc_flash_nrf.h"

Expand Down
2 changes: 1 addition & 1 deletion drivers/mspi/mspi_dw_vendor_specific.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)

#include <nrf.h>
#include <nrfx.h>

static inline void vendor_specific_init(const struct device *dev)
{
Expand Down
1 change: 0 additions & 1 deletion drivers/usb/common/nrf_usbd_common/nrf_usbd_common_errata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#define NRF_USBD_COMMON_ERRATA_H__

#include <nrfx.h>
#include <nrf_erratas.h>

#ifndef NRF_USBD_COMMON_ERRATA_ENABLE
/**
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/udc/udc_dwc2_vendor_quirks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ DT_INST_FOREACH_STATUS_OKAY(QUIRK_NRF_USBHS_DEFINE)

#define USBHS_DT_WRAPPER_REG_ADDR(n) UINT_TO_POINTER(DT_INST_REG_ADDR_BY_NAME(n, wrapper))

#include <nrf.h>
#include <nrfx.h>
#include <zephyr/logging/log.h>
#include <zephyr/drivers/clock_control.h>
#include <zephyr/drivers/clock_control/nrf_clock_control.h>
Expand Down
2 changes: 1 addition & 1 deletion modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <stddef.h>

#include <compiler_abstraction.h>
#include <nrfx.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/clock_control/nrf_clock_control.h>
#include <nrf_sys_event.h>
Expand Down
8 changes: 1 addition & 7 deletions modules/hal_nordic/nrfx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,13 @@ set(SOC_DIR ${BSP_DIR}/${CONFIG_SOC_NORDIC_BSP_NAME})
set(MDK_DIR ${SOC_DIR}/mdk)

if(NOT CONFIG_SOC_NORDIC_BSP_NAME STREQUAL "stable")
zephyr_compile_definitions(NRFX_BSP_NRF_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/mdk/nrf.h")
zephyr_compile_definitions(NRFX_BSP_ERRATAS_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/mdk/nrf_erratas.h")
zephyr_compile_definitions(NRFX_BSP_SOC_IRQS_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/soc/nrfx_irqs.h")
zephyr_compile_definitions(NRFX_BSP_NRFX_EXT_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/nrfx_ext.h")
zephyr_compile_definitions(NRFX_BSP_NRFX_COREDEP_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/soc/nrfx_coredep_defs.h")
zephyr_compile_definitions(NRFX_BSP_NRF_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/bsp.h")
endif()

zephyr_include_directories(${NRFX_DIR})
zephyr_include_directories(${INC_DIR})
zephyr_include_directories(${BSP_DIR})
zephyr_include_directories(${SOC_DIR})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this line is removed, then my solution from https://github.com/nrfconnect/sdk-zephyr/pull/3342/files will not work. It either needs to be restored or my PR needs to be reworked to have all BSP cloned to one predetermined place.

zephyr_include_directories(${SOC_DIR}/templates)
zephyr_include_directories(${MDK_DIR})
zephyr_include_directories(.)

include(${SOC_DIR}/zephyr/nrfx.cmake OPTIONAL)
Expand Down
2 changes: 1 addition & 1 deletion modules/hal_nordic/nrfx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1307,6 +1307,6 @@ endmenu

config NRFX_RESERVED_RESOURCES_HEADER
string
default "nrfx_config_reserved_resources_ncs.h"
default "nrfx_reserved_resources_ncs.h"

endmenu # "nrfx drivers"
Loading
Loading