Skip to content

Commit 40094b4

Browse files
MarekPietarlubos
authored andcommitted
Revert "applications: nrf_desktop: Imply partial flash erase for USB next"
This reverts commit b366128. The FLASH partial erase is no longer needed for USB next stack after UDC nRF implementation was improved. Jira: NCSDK-29639 Signed-off-by: Marek Pieta <[email protected]> Signed-off-by: Divya Pillai <[email protected]>
1 parent 2b8929b commit 40094b4

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

applications/nrf_desktop/src/modules/Kconfig.usb_state

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,9 @@ config DESKTOP_USB_STACK_NEXT
6565
bool "USB next stack [EXPERIMENTAL]"
6666
select EXPERIMENTAL
6767
select USB_DEVICE_STACK_NEXT
68-
imply SOC_FLASH_NRF_PARTIAL_ERASE
6968
help
7069
Use experimental integration of USB next stack.
7170

72-
The option implies partial erase of nRF SoC flash in the driver
73-
configuration to improve stability of the USB next stack. The partial
74-
erase feature works around device errors that might be reported by
75-
Windows USB host in Device Manager if USB cable is connected while
76-
erasing secondary image slot in background.
77-
7871
config DESKTOP_USB_STACK_LEGACY
7972
bool "USB legacy stack"
8073
select USB_DEVICE_STACK

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,10 @@ nRF Desktop
247247
* :ref:`zephyr:nrf54l15dk_nrf54l15`
248248
* :ref:`zephyr:nrf54h20dk_nrf54h20`
249249

250+
* 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>`).
251+
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.
252+
The workaround is no longer needed after the nRF UDC driver was improved.
253+
250254
nRF Machine Learning (Edge Impulse)
251255
-----------------------------------
252256

0 commit comments

Comments
 (0)