From 2b69aebec1599caff197f0e1aa4066589ff05c95 Mon Sep 17 00:00:00 2001 From: Kamil Kasperczyk Date: Fri, 8 Nov 2024 15:02:58 +0100 Subject: [PATCH] samples: matter: Moved watchdog enabling into snippet Created a dedicated snippet that allows to enable watchdog in the Matter applications. Additionally, watchdog was by default disabled in all dts files to fix the bug that we observe in CI and it leads into unexpected application reboots. Signed-off-by: Kamil Kasperczyk --- .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 3 +++ .../boards/nrf7002dk_nrf5340_cpuapp.overlay | 6 ++--- applications/matter_bridge/prj_release.conf | 3 --- applications/matter_bridge/sample.yaml | 3 +++ .../matter_weather_station/prj_release.conf | 3 --- .../nrf54h20/nrf54h20_cpuapp_peripherals.dtsi | 9 -------- .../boards/nrf21540dk_nrf52840.overlay | 3 +++ .../boards/nrf52840dk_nrf52840.overlay | 3 +++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 3 +++ .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 7 ------ .../nrf54l15dk_nrf54l15_cpuapp_ns.overlay | 7 ------ .../boards/nrf7002dk_nrf5340_cpuapp.overlay | 5 +++- samples/matter/light_bulb/prj_release.conf | 3 --- samples/matter/light_bulb/sample.yaml | 2 +- .../boards/nrf21540dk_nrf52840.overlay | 3 +++ .../boards/nrf52840dk_nrf52840.overlay | 3 +++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 3 +++ .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 9 -------- .../nrf54l15dk_nrf54l15_cpuapp_ns.overlay | 9 -------- .../boards/nrf7002dk_nrf5340_cpuapp.overlay | 8 +++---- samples/matter/light_switch/prj_release.conf | 3 --- samples/matter/light_switch/sample.yaml | 2 +- .../lock/boards/nrf21540dk_nrf52840.overlay | 3 +++ .../lock/boards/nrf52840dk_nrf52840.overlay | 3 +++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 3 +++ .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 9 -------- .../nrf54l15dk_nrf54l15_cpuapp_ns.overlay | 9 -------- .../boards/nrf7002dk_nrf5340_cpuapp.overlay | 8 +++---- .../nrf7002dk_nrf5340_cpuapp_nrf7001.overlay | 8 +++---- samples/matter/lock/prj_release.conf | 3 --- samples/matter/lock/sample.yaml | 4 ++-- .../boards/nrf52840dk_nrf52840.overlay | 3 +++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 3 +++ .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 9 -------- .../matter/smoke_co_alarm/prj_release.conf | 3 --- samples/matter/smoke_co_alarm/sample.yaml | 3 +-- .../boards/nrf21540dk_nrf52840.overlay | 4 ++++ .../boards/nrf52840dk_nrf52840.overlay | 3 +++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 3 +++ .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 9 -------- .../nrf54l15dk_nrf54l15_cpuapp_internal.conf | 3 --- ...rf54l15dk_nrf54l15_cpuapp_internal.overlay | 11 --------- .../nrf54l15dk_nrf54l15_cpuapp_ns.overlay | 9 -------- .../boards/nrf7002dk_nrf5340_cpuapp.overlay | 9 ++++---- samples/matter/template/prj_release.conf | 3 --- samples/matter/template/sample.yaml | 4 ++-- .../boards/nrf52840dk_nrf52840.overlay | 3 +++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 3 +++ .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 9 -------- .../nrf54l15dk_nrf54l15_cpuapp_ns.overlay | 9 -------- .../boards/nrf7002dk_nrf5340_cpuapp.overlay | 6 ++--- samples/matter/thermostat/prj_release.conf | 3 --- samples/matter/thermostat/sample.yaml | 2 +- .../boards/nrf21540dk_nrf52840.overlay | 4 ++++ .../boards/nrf52840dk_nrf52840.overlay | 4 ++++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 4 ++++ .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 7 ------ .../nrf54l15dk_nrf54l15_cpuapp_ns.overlay | 7 ------ .../matter/window_covering/prj_release.conf | 3 --- samples/matter/window_covering/sample.yaml | 3 +-- .../boards/nrf52840dk_nrf52840.overlay | 8 +++++++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 8 +++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 16 +++++++++++++ .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 15 ++++++++++++ .../boards/nrf7002dk_nrf5340_cpuapp.overlay | 14 +++++++++++ snippets/matter-watchdog/snippet.yml | 23 +++++++++++++++++++ snippets/matter-watchdog/watchdog.conf | 7 ++++++ 67 files changed, 193 insertions(+), 194 deletions(-) create mode 100644 snippets/matter-watchdog/boards/nrf52840dk_nrf52840.overlay create mode 100644 snippets/matter-watchdog/boards/nrf5340dk_nrf5340_cpuapp.overlay create mode 100644 snippets/matter-watchdog/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 snippets/matter-watchdog/boards/nrf54l15dk_nrf54l15_cpuapp.overlay create mode 100644 snippets/matter-watchdog/boards/nrf7002dk_nrf5340_cpuapp.overlay create mode 100644 snippets/matter-watchdog/snippet.yml create mode 100644 snippets/matter-watchdog/watchdog.conf diff --git a/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay b/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay index d941f278a4d7..ee95031f5863 100644 --- a/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -33,3 +33,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/applications/matter_bridge/boards/nrf7002dk_nrf5340_cpuapp.overlay b/applications/matter_bridge/boards/nrf7002dk_nrf5340_cpuapp.overlay index d2f135d77860..9514e19537b3 100644 --- a/applications/matter_bridge/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/applications/matter_bridge/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -8,8 +8,8 @@ chosen { nordic,pm-ext-flash = &mx25r64; }; +}; - aliases { - watchdog0 = &wdt0; - }; +&wdt0 { + status = "disabled"; }; diff --git a/applications/matter_bridge/prj_release.conf b/applications/matter_bridge/prj_release.conf index 8b5f5936fe49..5a13e535dac4 100644 --- a/applications/matter_bridge/prj_release.conf +++ b/applications/matter_bridge/prj_release.conf @@ -53,8 +53,5 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y # Enable the Read Client for binding purposes CONFIG_CHIP_ENABLE_READ_CLIENT=y -# Enable Watchdog -CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y - # Increase heap size to accommodate the memory required for additional bridged devices. CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=16384 diff --git a/applications/matter_bridge/sample.yaml b/applications/matter_bridge/sample.yaml index 2f1c205d5a5a..7f3150891911 100644 --- a/applications/matter_bridge/sample.yaml +++ b/applications/matter_bridge/sample.yaml @@ -8,6 +8,7 @@ tests: extra_args: FILE_SUFFIX=release CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y + matter_bridge_SNIPPET="matter-watchdog" integration_platforms: - nrf7002dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp @@ -46,6 +47,7 @@ tests: extra_args: FILE_SUFFIX=release CONFIG_BRIDGED_DEVICE_BT=y CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y + matter_bridge_SNIPPET="matter-watchdog" integration_platforms: - nrf7002dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp @@ -89,6 +91,7 @@ tests: build_only: true extra_args: FILE_SUFFIX=release SB_CONFIG_WIFI_NRF70=y CONFIG_CHIP_WIFI=y matter_bridge_SHIELD="nrf7002eb_interposer_p1;nrf7002eb" CONFIG_BRIDGED_DEVICE_BT=y + matter_bridge_SNIPPET="matter-watchdog" integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf54h20dk/nrf54h20/cpuapp diff --git a/applications/matter_weather_station/prj_release.conf b/applications/matter_weather_station/prj_release.conf index 3d2b4fe40ea1..9072f52b026f 100644 --- a/applications/matter_weather_station/prj_release.conf +++ b/applications/matter_weather_station/prj_release.conf @@ -69,9 +69,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y -# Enable Watchdog -CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y - # Enable Diagnostic Logs feature CONFIG_NCS_SAMPLE_MATTER_DIAGNOSTIC_LOGS=y CONFIG_NCS_SAMPLE_MATTER_DIAGNOSTIC_LOGS_CRASH_LOGS=y diff --git a/samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_peripherals.dtsi b/samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_peripherals.dtsi index 875e711677bd..3ede617aee90 100644 --- a/samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_peripherals.dtsi +++ b/samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_peripherals.dtsi @@ -14,15 +14,6 @@ zephyr,bt-hci-ipc = &ipc0; extmem-device = &mx25uw63; }; - - aliases { - watchdog0 = &cpuapp_wdt010; - }; -}; - -/* Watchdog */ -&cpuapp_wdt010 { - status = "okay"; }; /* Communication between Application Core and Secure Domain */ diff --git a/samples/matter/light_bulb/boards/nrf21540dk_nrf52840.overlay b/samples/matter/light_bulb/boards/nrf21540dk_nrf52840.overlay index 4cea80ea02c2..b7dfbd203eee 100644 --- a/samples/matter/light_bulb/boards/nrf21540dk_nrf52840.overlay +++ b/samples/matter/light_bulb/boards/nrf21540dk_nrf52840.overlay @@ -75,3 +75,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/light_bulb/boards/nrf52840dk_nrf52840.overlay b/samples/matter/light_bulb/boards/nrf52840dk_nrf52840.overlay index c761d3ebad55..c064a78badac 100644 --- a/samples/matter/light_bulb/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/light_bulb/boards/nrf52840dk_nrf52840.overlay @@ -79,3 +79,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay index 77d60d7e72ee..5476b55d7cd6 100644 --- a/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -68,3 +68,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 9c6e08786cd6..793e88d9cdd8 100644 --- a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -13,9 +13,6 @@ aliases { // Configure PWM module for led1 (LED2 on the board) pwm-led1 = &pwm_led1; - - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; }; pwmleds { @@ -65,7 +62,3 @@ }; }; }; - -&wdt31 { - status = "okay"; -}; diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay index f1081e02550c..4e262b842ef7 100644 --- a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay +++ b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay @@ -8,9 +8,6 @@ aliases { // Configure PWM module for led1 (LED2 on the board) pwm-led1 = &pwm_led1; - - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; }; chosen { @@ -65,10 +62,6 @@ }; }; -&wdt31 { - status = "okay"; -}; - // Change IRQ ids to handle button interrupts. // The default values for nRF54L15 are 219 and 269, diff --git a/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay index fe746730297a..ca166d4f5eff 100644 --- a/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -18,7 +18,6 @@ */ aliases { pwm-led1 = &pwm_led1; - watchdog0 = &wdt0; }; pwmleds { @@ -56,3 +55,7 @@ }; }; + +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/light_bulb/prj_release.conf b/samples/matter/light_bulb/prj_release.conf index 3039b977f82f..847dae8468c7 100644 --- a/samples/matter/light_bulb/prj_release.conf +++ b/samples/matter/light_bulb/prj_release.conf @@ -47,6 +47,3 @@ CONFIG_BOOT_BANNER=n # Enable Factory Data feature CONFIG_CHIP_FACTORY_DATA=y CONFIG_CHIP_FACTORY_DATA_BUILD=y - -# Enable Watchdog -CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y diff --git a/samples/matter/light_bulb/sample.yaml b/samples/matter/light_bulb/sample.yaml index c59d6cf5c4ed..f067d89688d5 100644 --- a/samples/matter/light_bulb/sample.yaml +++ b/samples/matter/light_bulb/sample.yaml @@ -17,7 +17,7 @@ tests: sample.matter.light_bulb.release: sysbuild: true build_only: true - extra_args: FILE_SUFFIX=release + extra_args: FILE_SUFFIX=release light_bulb_SNIPPET="matter-watchdog" SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y integration_platforms: - nrf52840dk/nrf52840 diff --git a/samples/matter/light_switch/boards/nrf21540dk_nrf52840.overlay b/samples/matter/light_switch/boards/nrf21540dk_nrf52840.overlay index 015c06a7c2a2..fbafb04c4ea0 100644 --- a/samples/matter/light_switch/boards/nrf21540dk_nrf52840.overlay +++ b/samples/matter/light_switch/boards/nrf21540dk_nrf52840.overlay @@ -37,3 +37,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/light_switch/boards/nrf52840dk_nrf52840.overlay b/samples/matter/light_switch/boards/nrf52840dk_nrf52840.overlay index 8fdd84cfba2a..4b27983e6cf9 100644 --- a/samples/matter/light_switch/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/light_switch/boards/nrf52840dk_nrf52840.overlay @@ -41,3 +41,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay index b2f9923aa7e7..1c59a6728d4a 100644 --- a/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -33,3 +33,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index d50ce7ca1302..a5265533ef33 100644 --- a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -5,11 +5,6 @@ */ / { - aliases { - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; - }; - chosen { nordic,pm-ext-flash = &mx25r64; }; @@ -33,7 +28,3 @@ &mx25r64 { status = "okay"; }; - -&wdt31 { - status = "okay"; -}; diff --git a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay index 3ec96169ec55..0285405de0dc 100644 --- a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay +++ b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay @@ -5,11 +5,6 @@ */ / { - aliases { - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; - }; - chosen { nordic,pm-ext-flash = &mx25r64; }; @@ -34,10 +29,6 @@ status = "okay"; }; -&wdt31 { - status = "okay"; -}; - // Change IRQ ids to handle button interrupts. // The default values for nRF54L15 are 219 and 269, diff --git a/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay index 280120007ef4..03a2fbe463b3 100644 --- a/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -10,13 +10,13 @@ chosen { nordic,pm-ext-flash = &mx25r64; }; - - aliases { - watchdog0 = &wdt0; - }; }; /* Set IPC thread priority to the highest value to not collide with other threads. */ &ipc0 { zephyr,priority = <0 PRIO_COOP>; }; + +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/light_switch/prj_release.conf b/samples/matter/light_switch/prj_release.conf index 14c7440904cd..770b26d043da 100644 --- a/samples/matter/light_switch/prj_release.conf +++ b/samples/matter/light_switch/prj_release.conf @@ -49,6 +49,3 @@ CONFIG_BOOT_BANNER=n # Enable Factory Data feature CONFIG_CHIP_FACTORY_DATA=y CONFIG_CHIP_FACTORY_DATA_BUILD=y - -# Enable Watchdog -CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y diff --git a/samples/matter/light_switch/sample.yaml b/samples/matter/light_switch/sample.yaml index 6a55dec80fa0..7103395d929e 100644 --- a/samples/matter/light_switch/sample.yaml +++ b/samples/matter/light_switch/sample.yaml @@ -17,7 +17,7 @@ tests: sample.matter.light_switch.release: sysbuild: true build_only: true - extra_args: FILE_SUFFIX=release + extra_args: FILE_SUFFIX=release light_switch_SNIPPET="matter-watchdog" SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y integration_platforms: - nrf52840dk/nrf52840 diff --git a/samples/matter/lock/boards/nrf21540dk_nrf52840.overlay b/samples/matter/lock/boards/nrf21540dk_nrf52840.overlay index 015c06a7c2a2..fbafb04c4ea0 100644 --- a/samples/matter/lock/boards/nrf21540dk_nrf52840.overlay +++ b/samples/matter/lock/boards/nrf21540dk_nrf52840.overlay @@ -37,3 +37,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/lock/boards/nrf52840dk_nrf52840.overlay b/samples/matter/lock/boards/nrf52840dk_nrf52840.overlay index 8fdd84cfba2a..4b27983e6cf9 100644 --- a/samples/matter/lock/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/lock/boards/nrf52840dk_nrf52840.overlay @@ -41,3 +41,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay index b2f9923aa7e7..1c59a6728d4a 100644 --- a/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -33,3 +33,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index d50ce7ca1302..a5265533ef33 100644 --- a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -5,11 +5,6 @@ */ / { - aliases { - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; - }; - chosen { nordic,pm-ext-flash = &mx25r64; }; @@ -33,7 +28,3 @@ &mx25r64 { status = "okay"; }; - -&wdt31 { - status = "okay"; -}; diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay index 3ec96169ec55..0285405de0dc 100644 --- a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay +++ b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay @@ -5,11 +5,6 @@ */ / { - aliases { - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; - }; - chosen { nordic,pm-ext-flash = &mx25r64; }; @@ -34,10 +29,6 @@ status = "okay"; }; -&wdt31 { - status = "okay"; -}; - // Change IRQ ids to handle button interrupts. // The default values for nRF54L15 are 219 and 269, diff --git a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay index 280120007ef4..03a2fbe463b3 100644 --- a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -10,13 +10,13 @@ chosen { nordic,pm-ext-flash = &mx25r64; }; - - aliases { - watchdog0 = &wdt0; - }; }; /* Set IPC thread priority to the highest value to not collide with other threads. */ &ipc0 { zephyr,priority = <0 PRIO_COOP>; }; + +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay index 837e117d126a..badc1e3954a0 100644 --- a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay +++ b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay @@ -10,13 +10,13 @@ chosen { nordic,pm-ext-flash = &mx25r64; }; - - aliases { - watchdog0 = &wdt0; - }; }; /* Set IPC thread priority to the highest value to not collide with other threads. */ &ipc0 { zephyr,priority = <0 PRIO_COOP>; }; + +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/lock/prj_release.conf b/samples/matter/lock/prj_release.conf index 836d92eba9ea..ab55c0d733ca 100644 --- a/samples/matter/lock/prj_release.conf +++ b/samples/matter/lock/prj_release.conf @@ -50,6 +50,3 @@ CONFIG_BOOT_BANNER=n # Enable Factory Data feature CONFIG_CHIP_FACTORY_DATA=y CONFIG_CHIP_FACTORY_DATA_BUILD=y - -# Enable Watchdog -CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y diff --git a/samples/matter/lock/sample.yaml b/samples/matter/lock/sample.yaml index 6e2dc6d9aa53..de473f77623f 100644 --- a/samples/matter/lock/sample.yaml +++ b/samples/matter/lock/sample.yaml @@ -20,7 +20,7 @@ tests: sample.matter.lock.release: sysbuild: true build_only: true - extra_args: FILE_SUFFIX=release + extra_args: FILE_SUFFIX=release lock_SNIPPET="matter-watchdog" integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp @@ -90,7 +90,7 @@ tests: sysbuild: true build_only: true extra_args: FILE_SUFFIX=release CONFIG_NCS_SAMPLE_MATTER_LEDS=n - CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=n + CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y integration_platforms: - nrf54l15dk/nrf54l15/cpuapp platform_allow: nrf54l15dk/nrf54l15/cpuapp diff --git a/samples/matter/smoke_co_alarm/boards/nrf52840dk_nrf52840.overlay b/samples/matter/smoke_co_alarm/boards/nrf52840dk_nrf52840.overlay index 99f374dc6814..0f8798e3e536 100644 --- a/samples/matter/smoke_co_alarm/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/smoke_co_alarm/boards/nrf52840dk_nrf52840.overlay @@ -39,3 +39,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay index fe200de812e0..a84c28f94a4e 100644 --- a/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -30,3 +30,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index cbb046ab75ae..4d8810feed3f 100644 --- a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -9,11 +9,6 @@ chosen { nordic,pm-ext-flash = &mx25r64; }; - - aliases { - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; - }; }; // restore full RRAM and SRAM space - by default some parts are dedicated to FLRP @@ -34,7 +29,3 @@ &mx25r64 { status = "okay"; }; - -&wdt31 { - status = "okay"; -}; diff --git a/samples/matter/smoke_co_alarm/prj_release.conf b/samples/matter/smoke_co_alarm/prj_release.conf index 4ff0f06129d6..03107f035b82 100644 --- a/samples/matter/smoke_co_alarm/prj_release.conf +++ b/samples/matter/smoke_co_alarm/prj_release.conf @@ -48,6 +48,3 @@ CONFIG_BOOT_BANNER=n # Enable Factory Data feature CONFIG_CHIP_FACTORY_DATA=y CONFIG_CHIP_FACTORY_DATA_BUILD=y - -# Enable Watchdog -CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y diff --git a/samples/matter/smoke_co_alarm/sample.yaml b/samples/matter/smoke_co_alarm/sample.yaml index 31cbf394baac..c14ef53adfe0 100644 --- a/samples/matter/smoke_co_alarm/sample.yaml +++ b/samples/matter/smoke_co_alarm/sample.yaml @@ -14,7 +14,7 @@ tests: sample.matter.smoke_co_alarm.release: sysbuild: true build_only: true - extra_args: FILE_SUFFIX=release + extra_args: FILE_SUFFIX=release smoke_co_alarm_SNIPPET="matter-watchdog" SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y integration_platforms: - nrf52840dk/nrf52840 @@ -36,7 +36,6 @@ tests: sysbuild: true build_only: true extra_args: FILE_SUFFIX=release CONFIG_NCS_SAMPLE_MATTER_LEDS=n - CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=n integration_platforms: - nrf54l15dk/nrf54l15/cpuapp platform_allow: nrf54l15dk/nrf54l15/cpuapp diff --git a/samples/matter/template/boards/nrf21540dk_nrf52840.overlay b/samples/matter/template/boards/nrf21540dk_nrf52840.overlay index 6dcf38dbaf8f..643974773130 100644 --- a/samples/matter/template/boards/nrf21540dk_nrf52840.overlay +++ b/samples/matter/template/boards/nrf21540dk_nrf52840.overlay @@ -14,3 +14,7 @@ zephyr,entropy = &rng; }; }; + +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/template/boards/nrf52840dk_nrf52840.overlay b/samples/matter/template/boards/nrf52840dk_nrf52840.overlay index e041e887d03c..992fb67925d8 100644 --- a/samples/matter/template/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/template/boards/nrf52840dk_nrf52840.overlay @@ -44,3 +44,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay index b2f9923aa7e7..1c59a6728d4a 100644 --- a/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -33,3 +33,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index d50ce7ca1302..a5265533ef33 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -5,11 +5,6 @@ */ / { - aliases { - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; - }; - chosen { nordic,pm-ext-flash = &mx25r64; }; @@ -33,7 +28,3 @@ &mx25r64 { status = "okay"; }; - -&wdt31 { - status = "okay"; -}; diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf index 28743cf2e3f7..9d8d67cba3ca 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf @@ -46,9 +46,6 @@ CONFIG_PRINTK_SYNC=n CONFIG_THREAD_NAME=n CONFIG_BOOT_BANNER=n -# Enable Watchdog -CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y - # Enable LTO CONFIG_LTO=y CONFIG_ISR_TABLES_LOCAL_DECLARATION=y diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay index 25c278b87624..6de18168039f 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay @@ -4,13 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/ { - aliases { - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; - }; -}; - // restore full RRAM and SRAM space - by default some parts are dedicated to FLRP &cpuapp_rram { reg = <0x0 DT_SIZE_K(1524)>; @@ -29,7 +22,3 @@ &mx25r64 { status = "disabled"; }; - -&wdt31 { - status = "okay"; -}; diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay index 3ec96169ec55..0285405de0dc 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay @@ -5,11 +5,6 @@ */ / { - aliases { - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; - }; - chosen { nordic,pm-ext-flash = &mx25r64; }; @@ -34,10 +29,6 @@ status = "okay"; }; -&wdt31 { - status = "okay"; -}; - // Change IRQ ids to handle button interrupts. // The default values for nRF54L15 are 219 and 269, diff --git a/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay index 79e4b79812f0..03a2fbe463b3 100644 --- a/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -10,14 +10,13 @@ chosen { nordic,pm-ext-flash = &mx25r64; }; - - aliases { - watchdog0 = &wdt0; - }; - }; /* Set IPC thread priority to the highest value to not collide with other threads. */ &ipc0 { zephyr,priority = <0 PRIO_COOP>; }; + +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/template/prj_release.conf b/samples/matter/template/prj_release.conf index c215fe7327b7..fe0ba57139de 100644 --- a/samples/matter/template/prj_release.conf +++ b/samples/matter/template/prj_release.conf @@ -55,6 +55,3 @@ CONFIG_CHIP_NFC_COMMISSIONING=n # Enable Factory Data feature CONFIG_CHIP_FACTORY_DATA=y CONFIG_CHIP_FACTORY_DATA_BUILD=y - -# Enable Watchdog -CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y diff --git a/samples/matter/template/sample.yaml b/samples/matter/template/sample.yaml index 0f1b14dac44c..89f3af93a60c 100644 --- a/samples/matter/template/sample.yaml +++ b/samples/matter/template/sample.yaml @@ -18,7 +18,7 @@ tests: sample.matter.template.release: sysbuild: true build_only: true - extra_args: FILE_SUFFIX=release + extra_args: FILE_SUFFIX=release template_SNIPPET="matter-watchdog" CONFIG_NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS=y integration_platforms: - nrf52840dk/nrf52840 @@ -83,7 +83,7 @@ tests: sample.matter.template.release.internal.smp_dfu: sysbuild: true build_only: true - extra_args: FILE_SUFFIX=internal CONFIG_CHIP_DFU_OVER_BT_SMP=y + extra_args: FILE_SUFFIX=internal CONFIG_CHIP_DFU_OVER_BT_SMP=y template_SNIPPET="matter-watchdog" CONFIG_NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS=y integration_platforms: - nrf54l15dk/nrf54l15/cpuapp diff --git a/samples/matter/thermostat/boards/nrf52840dk_nrf52840.overlay b/samples/matter/thermostat/boards/nrf52840dk_nrf52840.overlay index eab8a958812d..af43e8562d86 100644 --- a/samples/matter/thermostat/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/thermostat/boards/nrf52840dk_nrf52840.overlay @@ -44,3 +44,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/thermostat/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/thermostat/boards/nrf5340dk_nrf5340_cpuapp.overlay index f48b3d591840..ea552fc7792b 100644 --- a/samples/matter/thermostat/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/thermostat/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -26,3 +26,6 @@ &usbd { status = "disabled"; }; +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index d50ce7ca1302..a5265533ef33 100644 --- a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -5,11 +5,6 @@ */ / { - aliases { - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; - }; - chosen { nordic,pm-ext-flash = &mx25r64; }; @@ -33,7 +28,3 @@ &mx25r64 { status = "okay"; }; - -&wdt31 { - status = "okay"; -}; diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay index 3ec96169ec55..0285405de0dc 100644 --- a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay +++ b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay @@ -5,11 +5,6 @@ */ / { - aliases { - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; - }; - chosen { nordic,pm-ext-flash = &mx25r64; }; @@ -34,10 +29,6 @@ status = "okay"; }; -&wdt31 { - status = "okay"; -}; - // Change IRQ ids to handle button interrupts. // The default values for nRF54L15 are 219 and 269, diff --git a/samples/matter/thermostat/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/thermostat/boards/nrf7002dk_nrf5340_cpuapp.overlay index d2f135d77860..9514e19537b3 100644 --- a/samples/matter/thermostat/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/thermostat/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -8,8 +8,8 @@ chosen { nordic,pm-ext-flash = &mx25r64; }; +}; - aliases { - watchdog0 = &wdt0; - }; +&wdt0 { + status = "disabled"; }; diff --git a/samples/matter/thermostat/prj_release.conf b/samples/matter/thermostat/prj_release.conf index 7c5c64c3f8d3..86ffc0049364 100644 --- a/samples/matter/thermostat/prj_release.conf +++ b/samples/matter/thermostat/prj_release.conf @@ -52,6 +52,3 @@ CONFIG_CHIP_NFC_COMMISSIONING=n # Enable Factory Data feature CONFIG_CHIP_FACTORY_DATA=y CONFIG_CHIP_FACTORY_DATA_BUILD=y - -# Enable Watchdog -CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y diff --git a/samples/matter/thermostat/sample.yaml b/samples/matter/thermostat/sample.yaml index 9bc529fb542a..1d2c18edd534 100644 --- a/samples/matter/thermostat/sample.yaml +++ b/samples/matter/thermostat/sample.yaml @@ -17,7 +17,7 @@ tests: sample.matter.thermostat.release: sysbuild: true build_only: true - extra_args: FILE_SUFFIX=release + extra_args: FILE_SUFFIX=release thermostat_SNIPPET="matter-watchdog" SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y integration_platforms: - nrf52840dk/nrf52840 diff --git a/samples/matter/window_covering/boards/nrf21540dk_nrf52840.overlay b/samples/matter/window_covering/boards/nrf21540dk_nrf52840.overlay index 6ae39959a769..4e7bdcb6a092 100644 --- a/samples/matter/window_covering/boards/nrf21540dk_nrf52840.overlay +++ b/samples/matter/window_covering/boards/nrf21540dk_nrf52840.overlay @@ -74,3 +74,7 @@ }; }; }; + +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/window_covering/boards/nrf52840dk_nrf52840.overlay b/samples/matter/window_covering/boards/nrf52840dk_nrf52840.overlay index 4e5dad24ae5f..c9f333877bed 100644 --- a/samples/matter/window_covering/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/window_covering/boards/nrf52840dk_nrf52840.overlay @@ -81,3 +81,7 @@ }; }; }; + +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay index 765764531f5e..2e0dfaa484cc 100644 --- a/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -71,3 +71,7 @@ }; }; }; + +&wdt0 { + status = "disabled"; +}; diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index e17223d6df23..9b94658e8dc8 100644 --- a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -13,9 +13,6 @@ // Configure PWM module for led1 (LED2 on the board) pwm-led1 = &pwm_led1; pwm-led2 = &pwm_led2; - - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; }; pwmleds { @@ -68,7 +65,3 @@ }; }; }; - -&wdt31 { - status = "okay"; -}; diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay index ee12614d6519..9eafb6d59652 100644 --- a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay +++ b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay @@ -9,9 +9,6 @@ // Configure PWM module for led1 (LED2 on the board) pwm-led1 = &pwm_led1; pwm-led2 = &pwm_led2; - - // Use watchdog wdt31 as the application watchdog - watchdog0 = &wdt31; }; chosen { @@ -69,10 +66,6 @@ }; }; -&wdt31 { - status = "okay"; -}; - // Change IRQ ids to handle button interrupts. // The default values for nRF54L15 are 219 and 269, diff --git a/samples/matter/window_covering/prj_release.conf b/samples/matter/window_covering/prj_release.conf index eba5f2ca0bed..ef48355b69de 100644 --- a/samples/matter/window_covering/prj_release.conf +++ b/samples/matter/window_covering/prj_release.conf @@ -68,6 +68,3 @@ CONFIG_BOOT_BANNER=n # Enable Factory Data feature CONFIG_CHIP_FACTORY_DATA=y CONFIG_CHIP_FACTORY_DATA_BUILD=y - -# Enable Watchdog -CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y diff --git a/samples/matter/window_covering/sample.yaml b/samples/matter/window_covering/sample.yaml index 1ee871eafbdb..7adb90f99f3e 100644 --- a/samples/matter/window_covering/sample.yaml +++ b/samples/matter/window_covering/sample.yaml @@ -16,7 +16,7 @@ tests: sample.matter.window_cover.release: sysbuild: true build_only: true - extra_args: FILE_SUFFIX=release + extra_args: FILE_SUFFIX=release window_covering_SNIPPET="matter-watchdog" SB_CONFIG_BOOTLOADER_MCUBOOT=y SB_CONFIG_PARTITION_MANAGER=y integration_platforms: - nrf52840dk/nrf52840 @@ -40,7 +40,6 @@ tests: sysbuild: true build_only: true extra_args: FILE_SUFFIX=release CONFIG_NCS_SAMPLE_MATTER_LEDS=n - CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=n integration_platforms: - nrf54l15dk/nrf54l15/cpuapp platform_allow: nrf54l15dk/nrf54l15/cpuapp diff --git a/snippets/matter-watchdog/boards/nrf52840dk_nrf52840.overlay b/snippets/matter-watchdog/boards/nrf52840dk_nrf52840.overlay new file mode 100644 index 000000000000..65fe6c149b97 --- /dev/null +++ b/snippets/matter-watchdog/boards/nrf52840dk_nrf52840.overlay @@ -0,0 +1,8 @@ +/* Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&wdt0 { + status = "okay"; +}; diff --git a/snippets/matter-watchdog/boards/nrf5340dk_nrf5340_cpuapp.overlay b/snippets/matter-watchdog/boards/nrf5340dk_nrf5340_cpuapp.overlay new file mode 100644 index 000000000000..65fe6c149b97 --- /dev/null +++ b/snippets/matter-watchdog/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -0,0 +1,8 @@ +/* Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&wdt0 { + status = "okay"; +}; diff --git a/snippets/matter-watchdog/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/snippets/matter-watchdog/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..42240d5ee384 --- /dev/null +++ b/snippets/matter-watchdog/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,16 @@ +/* Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + aliases { + // Use watchdog cpuapp_wdt010 as the application watchdog + watchdog0 = &cpuapp_wdt010; + }; +}; + +/* Watchdog */ +&cpuapp_wdt010 { + status = "okay"; +}; diff --git a/snippets/matter-watchdog/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/snippets/matter-watchdog/boards/nrf54l15dk_nrf54l15_cpuapp.overlay new file mode 100644 index 000000000000..5bf2ab686a0d --- /dev/null +++ b/snippets/matter-watchdog/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -0,0 +1,15 @@ +/* Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + aliases { + // Use watchdog wdt31 as the application watchdog + watchdog0 = &wdt31; + }; +}; + +&wdt31 { + status = "okay"; +}; diff --git a/snippets/matter-watchdog/boards/nrf7002dk_nrf5340_cpuapp.overlay b/snippets/matter-watchdog/boards/nrf7002dk_nrf5340_cpuapp.overlay new file mode 100644 index 000000000000..f4c94044fad6 --- /dev/null +++ b/snippets/matter-watchdog/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -0,0 +1,14 @@ +/* Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + aliases { + watchdog0 = &wdt0; + }; +}; + +&wdt0 { + status = "okay"; +}; diff --git a/snippets/matter-watchdog/snippet.yml b/snippets/matter-watchdog/snippet.yml new file mode 100644 index 000000000000..8a35414b0e93 --- /dev/null +++ b/snippets/matter-watchdog/snippet.yml @@ -0,0 +1,23 @@ +name: matter-watchdog +append: + EXTRA_CONF_FILE: watchdog.conf + +boards: + nrf52840dk/nrf52840: + append: + EXTRA_DTC_OVERLAY_FILE: boards/nrf52840dk_nrf52840.overlay + nrf5340dk/nrf5340/cpuapp: + append: + EXTRA_DTC_OVERLAY_FILE: boards/nrf5340dk_nrf5340_cpuapp.overlay + nrf7002dk/nrf5340/cpuapp: + append: + EXTRA_DTC_OVERLAY_FILE: boards/nrf7002dk_nrf5340_cpuapp.overlay + thingy53/nrf5340/cpuapp: + append: + EXTRA_DTC_OVERLAY_FILE: boards/nrf5340dk_nrf5340_cpuapp.overlay + nrf54l15dk/nrf54l15/cpuapp: + append: + EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay + nrf54h20dk/nrf54h20/cpuapp: + append: + EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay diff --git a/snippets/matter-watchdog/watchdog.conf b/snippets/matter-watchdog/watchdog.conf new file mode 100644 index 000000000000..6d2a80484e62 --- /dev/null +++ b/snippets/matter-watchdog/watchdog.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y