treewide: align to modified include paths in nrfx

masz-nordic · masz-nordic · commit 914d28077f8d · 2025-10-23T13:29:25.000+02:00
Include nrfx instead of MDK.

Signed-off-by: Marcin Szymczyk &lt;marcin.szymczyk@nordicsemi.no&gt;
diff --git a/boards/nordic/nrf7120pdk/board.c b/boards/nordic/nrf7120pdk/board.c
@@ -6,8 +6,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/platform/hooks.h>
-#include "nrf7120_enga_types.h"
-#include "nrf7120_enga_global.h"
+#include <nrfx.h>
 
 #if CONFIG_BOARD_EARLY_INIT_HOOK
 /* Temporary workaround while VPR does not handle starting clocks */
diff --git a/include/bl_storage.h b/include/bl_storage.h
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <zephyr/types.h>
 #include <zephyr/autoconf.h>
-#include <drivers/nrfx_common.h>
+#include <nrfx.h>
 #if defined(CONFIG_NRFX_NVMC)
 #include <nrfx_nvmc.h>
 #elif defined(CONFIG_NRFX_RRAMC)
diff --git a/include/drivers/gpio/hpf_gpio.h b/include/drivers/gpio/hpf_gpio.h
@@ -7,7 +7,7 @@
 #ifndef HPF_GPIO_H
 #define HPF_GPIO_H
 
-#include <drivers/nrfx_common.h>
+#include <nrfx.h>
 #include <hpf/hpf_common.h>
 
 #ifdef __cplusplus
diff --git a/include/esb.h b/include/esb.h
@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <hal/nrf_radio.h>
 
 #include <zephyr/sys/util.h>
diff --git a/include/tfm/tfm_builtin_key_ids.h b/include/tfm/tfm_builtin_key_ids.h
@@ -7,7 +7,7 @@
 #ifndef __TFM_BUILTIN_KEY_IDS_H__
 #define __TFM_BUILTIN_KEY_IDS_H__
 
-#include <nrf.h>
+#include <nrfx.h>
 
 #if defined(NRF_CRACENCORE) || defined(CONFIG_CRACEN_HW_PRESENT)
 
diff --git a/lib/fem_al/fem_al.c b/lib/fem_al/fem_al.c
@@ -12,7 +12,7 @@
 #ifdef DPPI_PRESENT
 #include <nrfx_dppi.h>
 #endif
-#include <nrf_erratas.h>
+#include <nrfx.h>
 
 #include <zephyr/sys/printk.h>
 
diff --git a/lib/flash_patch/flash_patch.c b/lib/flash_patch/flash_patch.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/init.h>
 
diff --git a/lib/fprotect/fprotect_bprot.c b/lib/fprotect/fprotect_bprot.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #if defined(NRF_BPROT)
 	#include <hal/nrf_bprot.h>
 	#define PROTECT nrf_bprot_nvm_blocks_protection_enable
diff --git a/lib/fprotect/fprotect_rram.c b/lib/fprotect/fprotect_rram.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <soc.h>
-#include <nrf_erratas.h>
+#include <nrfx.h>
 #include <hal/nrf_rramc.h>
 
 #define RRAMC_REGION_FOR_FPROTECT_DEFAULT_VALUE 0x0000000f
diff --git a/lib/fprotect/fprotect_spu.c b/lib/fprotect/fprotect_spu.c
@@ -9,7 +9,7 @@
 #include <hal/nrf_spu.h>
 #include <errno.h>
 #include <soc.h>
-#include <nrf_erratas.h>
+#include <nrfx.h>
 
 
 #define SPU_BLOCK_SIZE CONFIG_FPROTECT_BLOCK_SIZE
diff --git a/lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c b/lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c
@@ -11,7 +11,6 @@
 #include <nrfx.h>
 #include <nrfx_nvmc.h>
 
-#include <mdk/nrf_erratas.h>
 #include <zephyr/logging/log.h>
 
 #define KMU_KEYSLOT_SIZE_WORDS 4
diff --git a/lib/nrf_modem_lib/nrf_modem_os.c b/lib/nrf_modem_lib/nrf_modem_os.c
@@ -9,7 +9,7 @@
 #include <zephyr/kernel.h>
 #include <nrf_modem.h>
 #include <nrf_modem_os.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <nrf_errno.h>
 #include <errno.h>
 
diff --git a/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c b/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c
@@ -19,7 +19,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "nrf.h"
+#include "nrfx.h"
 #include "hal/nrf_timer.h"
 
 #include "nrf_802154_sl_periphs.h"
diff --git a/modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h b/modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h
@@ -15,7 +15,7 @@
 
 #include <nrf-pinctrl.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 
 #define UART_PIN_INIT(node_id, prop, idx) DT_PROP_BY_IDX(node_id, prop, idx),
 
diff --git a/modules/trusted-firmware-m/tfm_boards/services/include/tfm_platform_user_memory_ranges.h b/modules/trusted-firmware-m/tfm_boards/services/include/tfm_platform_user_memory_ranges.h
@@ -11,7 +11,7 @@
 
 #include <tfm_ioctl_core_api.h>
 
-#include "nrf.h"
+#include "nrfx.h"
 
 /*
  * On platforms like nrf53 we provide a service for reading out
diff --git a/modules/trusted-firmware-m/tfm_boards/src/log_memory_protection.c b/modules/trusted-firmware-m/tfm_boards/src/log_memory_protection.c
@@ -7,8 +7,7 @@
 #include <cmsis.h>
 #include <tfm_spm_log.h>
 #include <mpu_armv8m_drv.h>
-#include <nrf.h>
-#include <nrf_peripherals.h>
+#include <nrfx.h>
 #include <array.h>
 #include <nrfx_nvmc.h>
 
diff --git a/samples/benchmarks/coremark/src/main.c b/samples/benchmarks/coremark/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/misc/coresight/nrf_etr.h>
-#include <system_nrf.h>
+#include <nrfx.h>
 
 #include "coremark_zephyr.h"
 
diff --git a/samples/bluetooth/direct_test_mode/src/dtm.c b/samples/bluetooth/direct_test_mode/src/dtm.c
@@ -37,7 +37,6 @@
 #include <helpers/nrfx_gppi.h>
 #include <nrfx_timer.h>
 
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/bluetooth/direct_test_mode/src/dtm_hw.c b/samples/bluetooth/direct_test_mode/src/dtm_hw.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include "nrf.h"
+#include "nrfx.h"
 
 #include "dtm_hw.h"
 #include "dtm_hw_config.h"
diff --git a/samples/crypto/psa_tls/src/main.c b/samples/crypto/psa_tls/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_client_non_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_server_non_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_dtls_functions_client.c b/samples/crypto/psa_tls/src/psa_dtls_functions_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_dtls_client);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_dtls_functions_server.c b/samples/crypto/psa_tls/src/psa_dtls_functions_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_dtls_server);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_tls_common.c b/samples/crypto/psa_tls/src/psa_tls_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_tls_functions_client.c b/samples/crypto/psa_tls/src/psa_tls_functions_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_client);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_tls_functions_server.c b/samples/crypto/psa_tls/src/psa_tls_functions_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_server);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_client_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_server_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/esb/esb_monitor/src/main.c b/samples/esb/esb_monitor/src/main.c
@@ -10,15 +10,14 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <dk_buttons_and_leds.h>
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/esb/esb_prx/src/main.c b/samples/esb/esb_prx/src/main.c
@@ -10,15 +10,14 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <dk_buttons_and_leds.h>
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/esb/esb_ptx/src/main.c b/samples/esb/esb_ptx/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
@@ -18,7 +18,6 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/nrf5340/empty_app_core/README.rst b/samples/nrf5340/empty_app_core/README.rst
@@ -55,7 +55,6 @@ Dependencies
 
 This sample has the following `nrfx`_ dependencies:
 
-* ``nrfx/nrf.h``
 * ``nrfx/nrfx.h``
 
 In addition, it uses the following Zephyr libraries:
diff --git a/samples/nrf5340/empty_app_core/src/main.c b/samples/nrf5340/empty_app_core/src/main.c
@@ -7,7 +7,6 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/init.h>
-#include <nrf.h>
 #include <nrfx.h>
 
 #define LFXO_NODE DT_NODELABEL(lfxo)
diff --git a/samples/peripheral/radio_test/src/main.c b/samples/peripheral/radio_test/src/main.c
@@ -13,7 +13,7 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
+#include <nrfx.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/peripheral/radio_test/src/radio_test.c b/samples/peripheral/radio_test/src/radio_test.c
@@ -28,7 +28,6 @@
 #include "fem_al/fem_al.h"
 #endif /* CONFIG_FEM */
 
-#include <nrf_erratas.h>
 #if NRF54H_ERRATA_216_PRESENT
 #include <zephyr/drivers/mbox.h>
 #endif /* NRF54H_ERRATA_216_PRESENT */
diff --git a/soc/nordic/nrf71/soc.c b/soc/nordic/nrf71/soc.c
@@ -29,9 +29,9 @@
 #include <cmsis_core.h>
 #include <hal/nrf_glitchdet.h>
 #endif
-#include <soc/nrfx_coredep.h>
 
-#include <system_nrf7120_enga.h>
+#include <nrfx.h>
+#include <soc/nrfx_coredep.h>
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
diff --git a/subsys/bootloader/bl_crypto/bl_crypto_cc310_common.c b/subsys/bootloader/bl_crypto/bl_crypto_cc310_common.c
@@ -8,7 +8,7 @@
 #include <zephyr/types.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/toolchain.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <nrf_cc310_bl_init.h>
 #include <pm_config.h>
 
diff --git a/subsys/bootloader/bl_storage/bl_storage.c b/subsys/bootloader/bl_storage/bl_storage.c
@@ -8,7 +8,7 @@
 #include <zephyr/autoconf.h>
 #include <string.h>
 #include <errno.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <assert.h>
 #if !defined(CONFIG_BUILD_WITH_TFM)
 #include <zephyr/kernel.h>
diff --git a/subsys/esb/esb.c b/subsys/esb/esb.c
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <errno.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <stddef.h>
 #include <string.h>
-#include <nrf_erratas.h>
 
 #include <hal/nrf_radio.h>
 #include <hal/nrf_timer.h>
diff --git a/subsys/mpsl/clock_ctrl/mpsl_clock_ctrl.c b/subsys/mpsl/clock_ctrl/mpsl_clock_ctrl.c
@@ -15,6 +15,7 @@
 
 #include <mpsl_clock.h>
 #include "mpsl_clock_ctrl.h"
+#include "nrf_errno.h"
 
 LOG_MODULE_REGISTER(mpsl_clock_ctrl, CONFIG_MPSL_LOG_LEVEL);
 
diff --git a/subsys/nfc/lib/platform.c b/subsys/nfc/lib/platform.c
diff --git a/subsys/nrf_security/src/drivers/cracen/common/include/security/cracen.h b/subsys/nrf_security/src/drivers/cracen/common/include/security/cracen.h
diff --git a/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c b/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c
diff --git a/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h b/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h
