Skip to content

manifest: update sdk-zephyr and nrfx #24846

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 8 commits into
base: collab-nrfx-4.0
Choose a base branch
from
Open

manifest: update sdk-zephyr and nrfx #24846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
23a3289
bluetooth: hci_driver: Prepare for new sdc_support_* API
vegardgu Sep 25, 2025
db2de7a
bluetooth: hci-driver: Remove temporary defines
vegardgu Oct 1, 2025
f3a5d77
mpsl: Remove call to unecessary call to mpsl_pan_rfu
rugeGerritsen Sep 29, 2025
83c8278
manifest: update sdk-zephyr, nrfx and nrfxlib
masz-nordic Oct 2, 2025
0476a0c
treewide: align to modified include paths in nrfx
masz-nordic Oct 2, 2025
61d8cbb
mpsl: align to name change in mpsl_hwres
masz-nordic Oct 16, 2025
e93187c
scripts: quarantine: add ns targets
masz-nordic Oct 16, 2025
bacd9e9
scripts: quarantine: add mcuboot fails
masz-nordic Oct 17, 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
3 changes: 1 addition & 2 deletions boards/nordic/nrf7120pdk/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion include/bl_storage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion include/drivers/gpio/hpf_gpio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/esb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion include/tfm/tfm_builtin_key_ids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion lib/fem_al/fem_al.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifdef DPPI_PRESENT
#include <nrfx_dppi.h>
#endif
#include <nrf_erratas.h>
#include <nrfx.h>

#include <zephyr/sys/printk.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/flash_patch/flash_patch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lib/fprotect/fprotect_bprot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/fprotect/fprotect_rram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/fprotect/fprotect_spu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/nrf_modem_lib/nrf_modem_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),

Expand Down
2 changes: 1 addition & 1 deletion modules/trusted-firmware-m/tfm_boards/services/include/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions modules/trusted-firmware-m/tfm_boards/src/log_memory_protection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion samples/benchmarks/coremark/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion samples/bluetooth/direct_test_mode/src/dtm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion samples/bluetooth/direct_test_mode/src/dtm_hw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion samples/crypto/psa_tls/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/crypto/psa_tls/src/psa_dtls_functions_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/crypto/psa_tls/src/psa_dtls_functions_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/crypto/psa_tls/src/psa_tls_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/crypto/psa_tls/src/psa_tls_functions_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/crypto/psa_tls/src/psa_tls_functions_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions samples/esb/esb_monitor/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
3 changes: 1 addition & 2 deletions samples/esb/esb_prx/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
3 changes: 1 addition & 2 deletions samples/esb/esb_ptx/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 */
Expand Down
1 change: 0 additions & 1 deletion samples/nrf5340/empty_app_core/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion samples/nrf5340/empty_app_core/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion samples/peripheral/radio_test/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
1 change: 0 additions & 1 deletion samples/peripheral/radio_test/src/radio_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
31 changes: 31 additions & 0 deletions scripts/quarantine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,34 @@
platforms:
- nrf5340dk/nrf5340/cpuapp
comment: "https://nordicsemi.atlassian.net/browse/NRFX-8480"

- platforms:
- .*ns
comment: "https://nordicsemi.atlassian.net/browse/NRFX-8563"

- scenarios:
- bluetooth.controller
platforms:
- native_sim/native
comment: "https://nordicsemi.atlassian.net/browse/NRFX-8565"

- scenarios:
- sample.bluetooth.fast_pair.*
- sample.bluetooth.mesh.*
- sample.dfu.dfu_target
- sample.matter.*
- sample.mcuboot.*
- mcuboot.*
- sample.nrf_security.sha256.integration
- sample.find_my.switchable_networks.*
- sample.find_my.locator_tag.*
- bluetooth.mesh.metadata_extraction_.*
- nrf_compress.*
- sample.cellular.smp_svr
- mcuboot.direct_xip
platforms:
- nrf52840dk/nrf52840
- nrf52840dongle/nrf52840
- [email protected]/nrf52840
- [email protected]/nrf9160
comment: "https://nordicsemi.atlassian.net/browse/NRFX-8562"
4 changes: 4 additions & 0 deletions scripts/quarantine_zephyr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,3 +587,7 @@
- llext.writable_relocatable_slid_linking
- llext.writable_relocatable
comment: "https://nordicsemi.atlassian.net/browse/NRFX-8497"

- platforms:
- .*ns
comment: "https://nordicsemi.atlassian.net/browse/NRFX-8563"
Comment on lines +591 to +593
Copy link
Contributor

Choose a reason for hiding this comment

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

no, this is not acceptable

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is not main branch, but collab-nrfx-4.0. Teams will need to align to nrfx 4.0 after it is released.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah right, hadn't noticed. In that case you do whatever you want I imagine.

4 changes: 2 additions & 2 deletions soc/nordic/nrf71/soc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Loading
Loading