treewide: align to modified include paths in nrfx

Remove unnecessary include paths in hal_nordic.
Replace MDK specific includes with nrfx include.

Signed-off-by: Marcin Szymczyk <[email protected]>

Author: masz-nordic

boards/native/nrf_bsim/soc/soc_secure.h

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

drivers/clock_control/clock_control_nrf.c

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

drivers/mspi/mspi_dw_vendor_specific.h

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

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

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)

modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h

@@ -9,7 +9,7 @@
 
 #include <tfm_ioctl_core_api.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 
 #ifdef NRF_FICR_S_BASE
 

soc/nordic/common/soc_secure.c

@@ -7,8 +7,6 @@
 #include <soc_secure.h>
 #include <errno.h>
 
-#include "nrf.h"
-
 #include "tfm_platform_api.h"
 #include "tfm_ioctl_api.h"
 

soc/nordic/common/soc_secure.h

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <stdint.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <hal/nrf_gpio.h>
 #include <hal/nrf_ficr.h>
 

soc/nordic/ironside/include/nrf_ironside/cpuconf.h

@@ -9,7 +9,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <zephyr/toolchain/common.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <nrf_ironside/call.h>
 
 /**

soc/nordic/nrf54h/bicr/CMakeLists.txt

@@ -1,7 +1,7 @@
 if(CONFIG_SOC_NRF54H20_GENERATE_BICR)
   set(bicr_json_file ${BOARD_DIR}/bicr.json)
   set(bicr_hex_file ${PROJECT_BINARY_DIR}/bicr.hex)
-  set(svd_file ${ZEPHYR_BASE}/../nrfx/bsp/stable/mdk/nrf54h20_application.svd)
+  set(svd_file ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/nrfx/bsp/stable/mdk/nrf54h20_application.svd)
 
   if(EXISTS ${bicr_json_file})
     set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${bicr_json_file})