Skip to content
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

Jump to bottom

applications: nrf_desktop: enable watchdog module for nRF54H20 DK #18914

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −2
Open

applications: nrf_desktop: enable watchdog module for nRF54H20 DK #18914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/* For nRF54H, watchdog status is disabled by default. Needs to be enabled in DTS overlay. */
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder if we shouldn't introduce app_release.overlay for that purpose - watchdog is used only by the release configuration (similar note for nRF54L). We used to keep it in common DTS overlay, because some time ago build system used not to support DTS overlays per build type.

&wdt010 {
status = "okay";
};

/ {
/* Redefine leds to fit CAF requirements. */
/delete-node/ leds;
Expand Down
4 changes: 3 additions & 1 deletion applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10

CONFIG_DESKTOP_BLE_LOW_LATENCY_LOCK=y

CONFIG_DESKTOP_WATCHDOG_ENABLE=y

CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y

Expand Down Expand Up @@ -67,7 +69,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=2560
CONFIG_IDLE_STACK_SIZE=512

CONFIG_HW_STACK_PROTECTION=n
CONFIG_RESET_ON_FATAL_ERROR=y
CONFIG_RESET_ON_FATAL_ERROR=n

CONFIG_SPEED_OPTIMIZATIONS=y

Expand Down
2 changes: 1 addition & 1 deletion doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ nRF5340 Audio
nRF Desktop
-----------

|no_changes_yet_note|
* Added support for the :ref:`nrf_desktop_watchdog` in the release configuration for the :ref:`zephyr:nrf54h20dk_nrf54h20`.
Copy link
Contributor

Choose a reason for hiding this comment

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

Added support -> Enabled?


nRF Machine Learning (Edge Impulse)
-----------------------------------
Expand Down
Loading