From 7567a64164b8e3c89f9c5531a59cb09806ff9d0e Mon Sep 17 00:00:00 2001 From: Marcin Szymczyk Date: Fri, 3 Oct 2025 11:49:32 +0200 Subject: [PATCH 1/2] modules: hal_nordic: nrfx: align to include cleanup Remove unnecessary paths. Signed-off-by: Marcin Szymczyk --- modules/hal_nordic/nrfx/CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt index 770e1798019..58f5de58dd1 100644 --- a/modules/hal_nordic/nrfx/CMakeLists.txt +++ b/modules/hal_nordic/nrfx/CMakeLists.txt @@ -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}) zephyr_include_directories(${SOC_DIR}/templates) -zephyr_include_directories(${MDK_DIR}) zephyr_include_directories(.) include(${SOC_DIR}/zephyr/nrfx.cmake OPTIONAL) From 54915e8c3b4828f4fff488746bd80c45375c7855 Mon Sep 17 00:00:00 2001 From: Marcin Szymczyk Date: Fri, 3 Oct 2025 11:50:01 +0200 Subject: [PATCH 2/2] treewide: align to nrfx paths rework Do not include MDK directly, instead include nrfx.h Signed-off-by: Marcin Szymczyk --- boards/native/nrf_bsim/soc/soc_secure.h | 2 +- drivers/clock_control/clock_control_nrf.c | 1 - drivers/flash/nrf_qspi_nor.c | 1 - drivers/flash/soc_flash_nrf.c | 1 - drivers/mspi/mspi_dw_vendor_specific.h | 2 +- drivers/usb/common/nrf_usbd_common/nrf_usbd_common_errata.h | 1 - drivers/usb/udc/udc_dwc2_vendor_quirks.h | 2 +- modules/nrf_wifi/bus/qspi_if.c | 1 - modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h | 2 +- soc/nordic/common/soc_secure.c | 2 -- soc/nordic/common/soc_secure.h | 2 +- soc/nordic/ironside/include/nrf_ironside/cpuconf.h | 2 +- soc/nordic/nrf53/soc.c | 2 +- soc/nordic/nrf54l/soc.c | 2 -- soc/nordic/validate_binding_headers.c | 2 +- .../controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h | 2 +- .../controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h | 2 +- .../controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h | 2 +- 18 files changed, 11 insertions(+), 20 deletions(-) diff --git a/boards/native/nrf_bsim/soc/soc_secure.h b/boards/native/nrf_bsim/soc/soc_secure.h index 06e9cc64993..e2be9dc0603 100644 --- a/boards/native/nrf_bsim/soc/soc_secure.h +++ b/boards/native/nrf_bsim/soc/soc_secure.h @@ -12,7 +12,7 @@ #include -#include +#include #include static inline void soc_secure_read_deviceid(uint32_t deviceid[2]) diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c index caa7aadff61..a45191ef930 100644 --- a/drivers/clock_control/clock_control_nrf.c +++ b/drivers/clock_control/clock_control_nrf.c @@ -14,7 +14,6 @@ #include #include #include -#include LOG_MODULE_REGISTER(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL); diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c index e9eb5a17302..9a3144f1d9e 100644 --- a/drivers/flash/nrf_qspi_nor.c +++ b/drivers/flash/nrf_qspi_nor.c @@ -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 #include #include #include diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c index 574739082dc..b48c4ee217e 100644 --- a/drivers/flash/soc_flash_nrf.c +++ b/drivers/flash/soc_flash_nrf.c @@ -15,7 +15,6 @@ #include #include #include -#include #include "soc_flash_nrf.h" diff --git a/drivers/mspi/mspi_dw_vendor_specific.h b/drivers/mspi/mspi_dw_vendor_specific.h index d32a53ac293..36d0ef57e06 100644 --- a/drivers/mspi/mspi_dw_vendor_specific.h +++ b/drivers/mspi/mspi_dw_vendor_specific.h @@ -12,7 +12,7 @@ #if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) -#include +#include static inline void vendor_specific_init(const struct device *dev) { diff --git a/drivers/usb/common/nrf_usbd_common/nrf_usbd_common_errata.h b/drivers/usb/common/nrf_usbd_common/nrf_usbd_common_errata.h index 0ee23ccd2c5..338818d4999 100644 --- a/drivers/usb/common/nrf_usbd_common/nrf_usbd_common_errata.h +++ b/drivers/usb/common/nrf_usbd_common/nrf_usbd_common_errata.h @@ -12,7 +12,6 @@ #define NRF_USBD_COMMON_ERRATA_H__ #include -#include #ifndef NRF_USBD_COMMON_ERRATA_ENABLE /** diff --git a/drivers/usb/udc/udc_dwc2_vendor_quirks.h b/drivers/usb/udc/udc_dwc2_vendor_quirks.h index 330ff8d113f..4fdcea5ff4f 100644 --- a/drivers/usb/udc/udc_dwc2_vendor_quirks.h +++ b/drivers/usb/udc/udc_dwc2_vendor_quirks.h @@ -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 +#include #include #include #include diff --git a/modules/nrf_wifi/bus/qspi_if.c b/modules/nrf_wifi/bus/qspi_if.c index 8d3dc81e347..6d2005a78f7 100644 --- a/modules/nrf_wifi/bus/qspi_if.c +++ b/modules/nrf_wifi/bus/qspi_if.c @@ -18,7 +18,6 @@ #include #include -#include #include #include #include diff --git a/modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h b/modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h index 43468c7fa31..0c1ba345923 100644 --- a/modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h +++ b/modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h @@ -9,7 +9,7 @@ #include -#include +#include #ifdef NRF_FICR_S_BASE diff --git a/soc/nordic/common/soc_secure.c b/soc/nordic/common/soc_secure.c index 64d647f220a..3bb8fa9e24e 100644 --- a/soc/nordic/common/soc_secure.c +++ b/soc/nordic/common/soc_secure.c @@ -7,8 +7,6 @@ #include #include -#include "nrf.h" - #include "tfm_platform_api.h" #include "tfm_ioctl_api.h" diff --git a/soc/nordic/common/soc_secure.h b/soc/nordic/common/soc_secure.h index e4b34a9bf64..84a673467b6 100644 --- a/soc/nordic/common/soc_secure.h +++ b/soc/nordic/common/soc_secure.h @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ #include -#include +#include #include #include diff --git a/soc/nordic/ironside/include/nrf_ironside/cpuconf.h b/soc/nordic/ironside/include/nrf_ironside/cpuconf.h index b112396704a..a0fabd8abbd 100644 --- a/soc/nordic/ironside/include/nrf_ironside/cpuconf.h +++ b/soc/nordic/ironside/include/nrf_ironside/cpuconf.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include /** diff --git a/soc/nordic/nrf53/soc.c b/soc/nordic/nrf53/soc.c index eb01872a71d..e4b311721b4 100644 --- a/soc/nordic/nrf53/soc.c +++ b/soc/nordic/nrf53/soc.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c index 76225d70ab7..0be52abe0f1 100644 --- a/soc/nordic/nrf54l/soc.c +++ b/soc/nordic/nrf54l/soc.c @@ -21,14 +21,12 @@ #include #include #include -#include #include LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL); #if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) || \ !defined(__ZEPHYR__) -#include #include #include #include diff --git a/soc/nordic/validate_binding_headers.c b/soc/nordic/validate_binding_headers.c index 98ffffe8670..d917ccba819 100644 --- a/soc/nordic/validate_binding_headers.c +++ b/soc/nordic/validate_binding_headers.c @@ -14,7 +14,7 @@ #include #include -#include +#include /** * Domain IDs. See: diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h index 7b22249ec92..1545b292d9c 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h +++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include /* Use the NRF_RTC instance for coarse radio event scheduling */ #define NRF_RTC NRF_RTC0 diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h index 10e942cca1e..7a5321e2ea4 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h +++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include /* Use the NRF_RTC instance for coarse radio event scheduling */ #define NRF_RTC NRF_RTC0 diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h index 80ab0f9e241..6c3ce7cf41f 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h +++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include /* Use the NRF_RTC instance for coarse radio event scheduling */ #define NRF_RTC NRF_RTC0