Skip to content

manifest: update collab-nrfx-4.0 to have wdt_nrfx reworked #24779

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

Merged
merged 3 commits into from
Oct 30, 2025
Merged

manifest: update collab-nrfx-4.0 to have wdt_nrfx reworked #24779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
504ff81
manifest: update collab-nrfx-4.0 to have wdt_nrfx reworked
mstasiaknordic Sep 30, 2025
b188d59
tests: drivers: nrfx_integration_test: remove WDT configs
mstasiaknordic Sep 30, 2025
262d07f
quarantine: temporarily add tests that do not build
magp-nordic Oct 29, 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
9 changes: 9 additions & 0 deletions scripts/quarantine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,12 @@
platforms:
- thingy53/nrf5340/cpuapp
comment: "https://nordicsemi.atlassian.net/browse/NRFX-8605"

- scenarios:
- sample.mcumgr.smp_svr.bt.*
- sample.mcumgr.smp_svr.serial.*
- sample.dfu.dfu_target
platforms:
- [email protected]/nrf54h20/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
comment: "Requires rebase on collab-nrfx-4.0 branch"
7 changes: 7 additions & 0 deletions scripts/quarantine_zephyr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,3 +591,10 @@
- platforms:
- .*ns
comment: "https://nordicsemi.atlassian.net/browse/NRFX-8563"

- scenarios:
- sample.mcumgr.smp_svr.serial.*
- sample.usbd.dfu
platforms:
- [email protected]/nrf54h20/cpuapp
comment: "Requires rebase on collab-nrfx-4.0 branch"
5 changes: 0 additions & 5 deletions tests/drivers/nrfx_integration_test/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@ config NRFX_ALL_DRIVERS
select NRFX_UARTE137 if HAS_HW_NRF_UARTE137
select NRFX_USBD if HAS_HW_NRF_USBD
select NRFX_USBREG if HAS_HW_NRF_USBREG
select NRFX_WDT0 if HAS_HW_NRF_WDT0
Copy link
Contributor

@magp-nordic magp-nordic Oct 28, 2025

Choose a reason for hiding this comment

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

Could be replaced with select NRFX_WDT if HAS_HW_NRF_WDT0 || HAS_HW_NRF_WDT1 ..., like it was done here: d858ed6 / But can also stay as it is.

select NRFX_WDT1 if HAS_HW_NRF_WDT1
select NRFX_WDT30 if HAS_HW_NRF_WDT30
select NRFX_WDT31 if HAS_HW_NRF_WDT31
select NRFX_WDT130 if HAS_HW_NRF_WDT130
select NRFX_PRS_BOX_0

source "Kconfig.zephyr"
6 changes: 3 additions & 3 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: c3b37acdd1d91054f7767fea38b907710849a852
revision: b9bf21a1e92d9416dcf191c502c20c2b6b862e77
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -129,7 +129,7 @@ manifest:
compare-by-default: true
- name: mcuboot
repo-path: sdk-mcuboot
revision: 40861fd7351604d38af6345e56fe7422529561e6
revision: pull/558/head
path: bootloader/mcuboot
- name: qcbor
url: https://github.com/laurencelundblade/QCBOR
Expand Down Expand Up @@ -280,7 +280,7 @@ manifest:
path: nrfx
groups:
- nrfx
revision: 125d3e9fa2dcfd9fe3187d6f5e47e269e01023f1
revision: 0746a590c62e039fd1e453b423d594f5fa57ddc9

# West-related configuration for the nrf repository.
self:
Expand Down
Loading