Skip to content

Commit b64ddb4

Browse files
committed
applications: nrf_desktop: enable MPU in MCUboot SMP config for gmouse
Enabled the CONFIG_ARM_MPU Kconfig option in the MCUboot SMP configuration of the nRF52840 Gaming Mouse target. Signed-off-by: Kamil Piszczek <[email protected]>
1 parent b22f2cd commit b64ddb4

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ CONFIG_ERRNO=n
2828
CONFIG_PRINTK=n
2929
CONFIG_CBPRINTF_NANO=y
3030
CONFIG_TIMESLICING=n
31-
CONFIG_ARM_MPU=n
3231
CONFIG_THREAD_STACK_INFO=n
3332

3433
# Disable USB

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ nRF Desktop
254254
* :ref:`zephyr:nrf54l15dk_nrf54l15`
255255
* :ref:`zephyr:nrf54h20dk_nrf54h20`
256256

257+
* MCUboot bootloader configuration for the MCUboot SMP build type and the nRF52840 Gaming Mouse target to enable the :kconfig:option:`CONFIG_ARM_MPU` Kconfig option that is required to enable hardware stack protection (:kconfig:option:`CONFIG_HW_STACK_PROTECTION`).
258+
257259
* Removed imply for partial erase feature of the nRF SoC flash driver (:kconfig:option:`CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE`) for the USB next stack (:ref:`CONFIG_DESKTOP_USB_STACK_NEXT <config_desktop_app_options>`).
258260
The partial erase feature was used as a workaround for device errors that might be reported by the Windows USB host in Device Manager if a USB cable is connected while erasing a secondary image slot in the background.
259261
The workaround is no longer needed after the nRF UDC driver was improved.

0 commit comments

Comments
 (0)