manifest: update sdk-zephyr and nrfx

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>

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)
 

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>
 

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>
 

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

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

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

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

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>
 

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"

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

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

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>
 

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

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"

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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

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

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

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:

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)

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

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

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>
 

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>

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>

subsys/nfc/lib/platform.c

@@ -18,8 +18,6 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/onoff.h>
 
-#include <nrf_erratas.h>
-
 #include <nrfx_nfct.h>
 #include <nrfx_timer.h>
 #include <hal/nrf_ficr.h>

subsys/nrf_security/src/drivers/cracen/common/include/security/cracen.h

@@ -16,7 +16,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <nrf.h>
+#include <nrfx.h>
 
 #include <hal/nrf_cracen.h>
 

subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c

@@ -10,7 +10,7 @@
 
 #include <zephyr/kernel.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 
 #if defined(CONFIG_SOC_SERIES_NRF54LX)
 #include <nrfx_rramc.h>

subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h

@@ -8,7 +8,7 @@
 #define HW_HEADER_FILE
 
 #include <cracen/membarriers.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <sxsymcrypt/internal.h>

west.yml

@@ -66,7 +66,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: c475e9f2c9eedd5aef47e2e0a36eb02d05e87a7f
+      revision: pull/3355/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -280,7 +280,7 @@ manifest:
       path: nrfx
       groups:
         - nrfx
-      revision: 98167a75a6ed8eb530c4e2977118619b51fd75b0
+      revision: pull/977/head
 
   # West-related configuration for the nrf repository.
   self: