applications: nrf_desktop: Align reset on fatal in child imgs

Disable CONFIG_RESET_ON_FATAL_ERROR in MCUboot, B0 and hci_rpmsg debug configurations in the nRF Desktop app and mark itas a debugging feature. Explicitly enable this option in the release configurations. Jira: NCSDK-22426 Signed-off-by: Mateusz Kapala <[email protected]>
nrfconnect · Jan 12, 2024 · fe3d4e2 · fe3d4e2
1 parent dc5016f
commit fe3d4e2
Show file tree

Hide file tree

Showing 31 changed files with 94 additions and 1 deletion.
diff --git a/...ns/nrf_desktop/configuration/nrf52820dongle_nrf52820/child_image/mcuboot/prj_release.conf b/...ns/nrf_desktop/configuration/nrf52820dongle_nrf52820/child_image/mcuboot/prj_release.conf
@@ -63,3 +63,6 @@ CONFIG_BOOT_SERIAL_IMG_GRP_HASH=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/...ations/nrf_desktop/configuration/nrf52833dk_nrf52820/child_image/mcuboot/prj_release.conf b/...ations/nrf_desktop/configuration/nrf52833dk_nrf52820/child_image/mcuboot/prj_release.conf
@@ -67,3 +67,6 @@ CONFIG_BOOT_SERIAL_IMG_GRP_HASH=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/prj.conf
@@ -64,3 +64,6 @@ CONFIG_BOOT_BANNER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...ations/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/prj_release.conf b/...ations/nrf_desktop/configuration/nrf52833dk_nrf52833/child_image/mcuboot/prj_release.conf
@@ -61,3 +61,6 @@ CONFIG_BOOT_BANNER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/prj.conf
@@ -64,3 +64,6 @@ CONFIG_BOOT_BANNER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...ns/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/prj_release.conf b/...ns/nrf_desktop/configuration/nrf52833dongle_nrf52833/child_image/mcuboot/prj_release.conf
@@ -60,3 +60,6 @@ CONFIG_BOOT_BANNER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj.conf
@@ -37,3 +37,6 @@ CONFIG_ASSERT=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_dongle.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_dongle.conf
@@ -37,3 +37,6 @@ CONFIG_ASSERT=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_keyboard.conf
@@ -37,3 +37,6 @@ CONFIG_ASSERT=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_release.conf
@@ -37,3 +37,6 @@ CONFIG_ASSERT=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_wwcb.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/b0/prj_wwcb.conf
@@ -37,3 +37,6 @@ CONFIG_ASSERT=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...ions/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_fast_pair.conf b/...ions/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_fast_pair.conf
@@ -39,3 +39,6 @@ CONFIG_NORDIC_QSPI_NOR=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...s/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_mcuboot_qspi.conf b/...s/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_mcuboot_qspi.conf
@@ -52,3 +52,6 @@ CONFIG_BOOT_BANNER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...ns/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf b/...ns/nrf_desktop/configuration/nrf52840dk_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf
@@ -37,3 +37,6 @@ CONFIG_BOOT_BANNER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj.conf
@@ -43,3 +43,6 @@ CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...ations/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_3bleconn.conf b/...ations/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_3bleconn.conf
@@ -43,3 +43,6 @@ CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...tions/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_4llpmconn.conf b/...tions/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_4llpmconn.conf
@@ -43,3 +43,6 @@ CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...cations/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_release.conf b/...cations/nrf_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_release.conf
@@ -43,3 +43,6 @@ CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/...f_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_release_4llpmconn.conf b/...f_desktop/configuration/nrf52840dongle_nrf52840/child_image/b0/prj_release_4llpmconn.conf
@@ -43,3 +43,6 @@ CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj.conf
@@ -37,3 +37,6 @@ CONFIG_ASSERT=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...cations/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj_release.conf b/...cations/nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/b0/prj_release.conf
@@ -37,3 +37,6 @@ CONFIG_ASSERT=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/.../nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_fast_pair.conf b/.../nrf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_fast_pair.conf
@@ -33,3 +33,6 @@ CONFIG_BOOT_BANNER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...rf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf b/...rf_desktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_mcuboot_smp.conf
@@ -31,11 +31,13 @@ CONFIG_SERIAL=n
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_ERRNO=n
 CONFIG_PRINTK=n
-CONFIG_RESET_ON_FATAL_ERROR=n
 CONFIG_CBPRINTF_NANO=y
 CONFIG_TIMESLICING=n
 CONFIG_ARM_MPU=n
 CONFIG_THREAD_STACK_INFO=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...ktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_release_fast_pair.conf b/...ktop/configuration/nrf52840gmouse_nrf52840/child_image/mcuboot/prj_release_fast_pair.conf
@@ -33,3 +33,6 @@ CONFIG_BOOT_BANNER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/child_image/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/child_image/b0/prj_release.conf
@@ -37,3 +37,6 @@ CONFIG_ASSERT=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/...rf_desktop/configuration/nrf52kbd_nrf52832/child_image/mcuboot/prj_release_fast_pair.conf b/...rf_desktop/configuration/nrf52kbd_nrf52832/child_image/mcuboot/prj_release_fast_pair.conf
@@ -33,3 +33,6 @@ CONFIG_BOOT_BANNER=n
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/b0/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/b0/prj.conf
@@ -40,3 +40,6 @@ CONFIG_MINIMAL_LIBC=y
 
 # The anomaly 160 workaround is not needed for the bootloader.
 CONFIG_SOC_NRF53_ANOMALY_160_WORKAROUND_NEEDED=n
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...ations/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/b0/prj_release.conf b/...ations/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/b0/prj_release.conf
@@ -40,3 +40,6 @@ CONFIG_MINIMAL_LIBC=y
 
 # The anomaly 160 workaround is not needed for the bootloader.
 CONFIG_SOC_NRF53_ANOMALY_160_WORKAROUND_NEEDED=n
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/hci_ipc/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/hci_ipc/prj.conf
@@ -36,3 +36,6 @@ CONFIG_EXCEPTION_STACK_TRACE=y
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve debugging experience by disabling reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=n
diff --git a/...s/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/hci_ipc/prj_release.conf b/...s/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/child_image/hci_ipc/prj_release.conf
@@ -32,3 +32,6 @@ CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=3000
 
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
+
+# Improve firmware reliability
+CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
@@ -249,6 +249,10 @@ nRF Desktop
     The ``CONFIG_USB_HID_BOOT_PROTOCOL`` Kconfig option was removed and dedicated API needs to be used instead.
   * Disabled MCUboot's logs over RTT (:kconfig:option:`CONFIG_LOG_BACKEND_RTT` and :kconfig:option:`CONFIG_USE_SEGGER_RTT`) on ``nrf52840dk_nrf52840`` in :file:`prj_mcuboot_qspi.conf` configuration to reduce MCUboot memory footprint and avoid flash overflows.
     Explicitly enabled the UART log backend (:kconfig:option:`CONFIG_LOG_BACKEND_UART`) together with its dependencies in the configuration file to ensure log visibility.
+  * The MCUboot, B0, and HCI RPMsg child images debug configurations to disable the :kconfig:option:`CONFIG_RESET_ON_FATAL_ERROR` Kconfig option.
+    Disabling this Kconfig option improves the debugging experience.
+  * The MCUboot, B0, and HCI RPMsg child images release configurations to explicitly enable the :kconfig:option:`CONFIG_RESET_ON_FATAL_ERROR` Kconfig option.
+    Enabling this Kconfig option improves the reliability of the firmware.
 
 Thingy:53: Matter weather station
 ---------------------------------