Skip to content

manifest: Upmerge sdk-zephyr and sdk-mcuboot repositories #23979

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

Merged
carlescufi merged 59 commits into from
Sep 23, 2025
+618 −716
Merged

manifest: Upmerge sdk-zephyr and sdk-mcuboot repositories #23979

Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
88b9ff3
manifest: Upmerge sdk-zephyr, sdk-mbedtls and sdk-mcuboot
jukkar Aug 13, 2025
6b5954a
boards: Remove usage of deprecated BT_CTLR Kconfig option
cvinayak Sep 9, 2025
9cce74e
samples: openthread: Switch to new USB driver
ArekBalysNordic Sep 9, 2025
790e6e3
samples: net: mqtt: Align with SMF API changes
rlubos Sep 9, 2025
beb85e3
samples: openthread: Align coprocessor HCI to new USB stack
ArekBalysNordic Sep 11, 2025
6964d22
treewide: Remove use of CONFIG_DEBUG_INFO
tokangas Sep 11, 2025
5ed32c7
samples: bluetooth: llpm: remove nrf52840dongle USB configuration
jfischer-no Sep 11, 2025
9cf8b37
samples: bluetooth: peripheral_uart: use CDC ACM serial backend
jfischer-no Sep 11, 2025
ce3baf0
samples: nrf5340: remote_shell: use CDC ACM serial backend
jfischer-no Sep 11, 2025
d590922
tests: net: lwm2m: Align with API changes
juhaylinen Sep 10, 2025
000f4bf
bluetooth: In hci_internal_msg_get add msg_type_out cast to avoid warn
ppryga-nordic Sep 12, 2025
d584e6e
modules: memfault-firmware-sdk: Fix SMF handling
simensrostad Sep 12, 2025
17ad77b
boards: nordic: thingy91x: Remove use of deprecated Kconfig option
tokangas Sep 12, 2025
ea0cabe
applications: serial_lte_modem: Remove undefined Kconfig options
tokangas Sep 12, 2025
5cf1d66
treewide: Remove TinyCrypt Kconfig options from conf files
tokangas Sep 12, 2025
c754c18
bluetooth: cs_de: Fix after combined main and sub mode CS steps
ppryga-nordic Sep 12, 2025
5c81766
samples: wifi: shell: Remove CONFIG_NFCT_PINS_AS_GPIOS from overlay
tokangas Sep 12, 2025
361dffa
samples: wifi: softap: Fix twister errors
rado17 Sep 12, 2025
cc4218f
drivers: mspi: remove redundant gpd handling
bjarki-andreasen Jul 15, 2025
d59034c
samples: smp_svr: extend mcuboot_merged_slot.overlay
bjarki-andreasen Jul 31, 2025
1dd2dc2
nrf_compress: decompression: mcuboot_update: adjust nrf54h20dk pd
bjarki-andreasen Jul 31, 2025
f70ffed
benchmarks: multicore: idle: select PM_DEVICE_RUNTIME
bjarki-andreasen Aug 7, 2025
bd7abbe
applications: matter: Fix Weather Station USB stack
ArekBalysNordic Sep 12, 2025
3546dd9
quarantine: Add overflows to quarantine
katgiadla Sep 12, 2025
5eac158
applications: serial_lte_modem: Fix compilation warning
tokangas Sep 15, 2025
21401bd
samples: bluetooth: remote_shell: use CDC ACM serial backend
jfischer-no Sep 12, 2025
78664a3
samples: peripheral: use CDC ACM serial backend
jfischer-no Sep 12, 2025
bdfe8e1
samples: wifi: allow samples using legacy USB stacks to pass CI
jfischer-no Sep 12, 2025
c7e5bff
samples: i2c: Add missing Kconfig to rtio_loopback sample
kl-cruz Sep 11, 2025
c0620c3
tests: bluetooth: iso Remove uses of auto name from advertising params
ppryga-nordic Sep 15, 2025
768fe9a
samples: pmic: fix devicetree errors on uicr build
seov-nordic Sep 15, 2025
f104508
applications: nrf_desktop: Fix legacy USB CI failures
MarekPieta Sep 15, 2025
3792795
applications: nrf_desktop: Fix MCUboot serial CDC ACM CI failures
MarekPieta Sep 15, 2025
3fc0f6d
applications: nrf5340_audio: Updates for upmerge
gWacey Sep 15, 2025
982089d
applications: nrf_desktop: Suppress deprecation warnings in usb_state.c
MarekPieta Sep 15, 2025
52be251
applications: connectivity_bridge: allow application to pass CI
jfischer-no Sep 15, 2025
b04f14b
tests: mcuboot: external_flash: allow test to pass CI
jfischer-no Sep 16, 2025
65ead17
sysbuild: kconfig: MCUBoot default swap mode
michalek-no Sep 16, 2025
0091255
bluetooth: fast_pair: Drop TinyCrypt Fast Pair crypto backend
MarekPieta Sep 16, 2025
c478776
tests: fast_pair: crypto: Drop unit tests for TinyCrypt
MarekPieta Sep 16, 2025
6c1bd18
applications: nrf_desktop: Do not unset nRF5 bootloader
tomchy Jul 9, 2025
b7e9cd1
samples: nfc: writable_ndef_msg: Select config CRC when ZMS is enabled
doki-nordic Sep 16, 2025
b23a6b7
doc: Add missing dependency: sphinxcontrib.programoutput
carlescufi Sep 17, 2025
4cd320d
samples: openthread: Drop support for L2 in coprocessor
ArekBalysNordic Sep 17, 2025
00a9f45
nfc: add explicit cast in LE OOB record encoder for LE Role enum
grochu Sep 17, 2025
84f4919
sysbuild: remove PERIPHCONF generation via nrf-regtool uicr-migrate
jonathannilsen Sep 17, 2025
f0b5685
samples: bluetooth: peripheral_status: - remove thingy53 support
grochu Sep 17, 2025
39482c3
bt_rpc: Always enable dynamic callbacks for BT_RPC
doki-nordic Sep 18, 2025
20f4979
quarantine: Add overflowed test configurations
katgiadla Sep 18, 2025
a6f69a3
samples: bluetooth: Use unified mode in CS config logging
Mirlenko Sep 18, 2025
467b7a2
doc: requirements: Add tabulate requirement
carlescufi Sep 18, 2025
5982004
samples: smp_svr: extend mcuboot_requests.overlay
ahasztag Sep 19, 2025
e3c9553
quarantine: Put the nRF Desktop app back in quarantine
jukkar Sep 22, 2025
1a1657e
applications: nrf_desktop: Fix .rst bullet list formatting
carlescufi Sep 22, 2025
d1f4a47
doc: redirects: Switch from list to tuple
carlescufi Sep 22, 2025
99ee746
doc: boards: Align native_sim to zephyr-board
carlescufi Sep 22, 2025
8daa758
workflows: compliance: Add missing dependency: tabulate
carlescufi Sep 22, 2025
ba02135
boards: nordic: nrf54l09pdk: Remove remaining ref to obsolete board
jukkar Sep 23, 2025
e6bc10d
manifest: sdk-zephyr, sdk-mbedtls and sdk-mcuboot rebase
jukkar Sep 23, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/compliance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
pip3 install -U pip
pip3 install -U wheel
grep -E "^setuptools" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
grep -E "^python-magic=|^junitparser|^lxml|^gitlint|^pylint|^pykwalify|^yamllint|^unidiff|^vermin|^python-dotenv" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
grep -E "^python-magic=|^junitparser|^lxml|^gitlint|^pylint|^pykwalify|^yamllint|^unidiff|^vermin|^python-dotenv|^tabulate" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
grep -E "^west" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
pip3 show -f west

Expand Down
6 changes: 0 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,3 @@ add_subdirectory(subsys)
add_subdirectory(modules)
add_subdirectory(drivers)
add_subdirectory(tests)

# TEMPHACK: Add a source file generated by cmake/sysbuild/periphconf_migrate.cmake
if(SYSBUILD AND CONFIG_NRF_HALTIUM_GENERATE_UICR)
file(TOUCH ${APPLICATION_BINARY_DIR}/../periphconf_migrated.c)
zephyr_sources(${APPLICATION_BINARY_DIR}/../periphconf_migrated.c)
endif()
8 changes: 4 additions & 4 deletions Kconfig.nrf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
config FLASH_BASE_ADDRESS
hex
depends on PARTITION_MANAGER_ENABLED
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR|| SOC_NRF7120_ENGA_CPUFLPR
default 0x0 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR|| SOC_NRF7120_ENGA_CPUFLPR
default 0x0 if SOC_NRF54L15_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR
default 0x2C0000 if SOC_NRF7120_ENGA_CPUFLPR

config FLASH_SIZE
int
depends on PARTITION_MANAGER_ENABLED
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
default 1012 if SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
default 1012 if SOC_NRF54LV10A_ENGA_CPUFLPR
default 1524 if SOC_NRF54L15_CPUFLPR
default 2036 if SOC_NRF54LM20A_ENGA_CPUFLPR
default 128 if SOC_NRF7120_ENGA_CPUFLPR
Expand Down
2 changes: 2 additions & 0 deletions applications/connectivity_bridge/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor"
CONFIG_USB_DEVICE_SN="THINGY91 12PLACEHLDRS" # This is overridden at runtime
CONFIG_USB_COMPOSITE_DEVICE=y
CONFIG_USB_CDC_ACM_RINGBUF_SIZE=16384
# Sample uses deprecated code and needs to be ported to the new USB device stack.
CONFIG_DEPRECATION_TEST=y

# Disk and file system
CONFIG_DISK_ACCESS=y
Expand Down
2 changes: 2 additions & 0 deletions applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ CONFIG_USB_MASS_STORAGE=n
CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor"
CONFIG_USB_DEVICE_VID=0x1915
CONFIG_USB_DEVICE_PID=0x520F
# Sample uses deprecated code and needs to be ported to the new USB device stack.
CONFIG_DEPRECATION_TEST=y
2 changes: 2 additions & 0 deletions applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ CONFIG_USB_MASS_STORAGE=n
CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor"
CONFIG_USB_DEVICE_VID=0x1915
CONFIG_USB_DEVICE_PID=0x910A
# Sample uses deprecated code and needs to be ported to the new USB device stack.
CONFIG_DEPRECATION_TEST=y

CONFIG_BOOT_SERIAL_BOOT_MODE=y

Expand Down
7 changes: 0 additions & 7 deletions applications/connectivity_bridge/sysbuild/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n
### mbedTLS has its own heap
# CONFIG_HEAP_MEM_POOL_SIZE is not set

### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed,
### MCUboot has its own copy in tree.
# CONFIG_TINYCRYPT is not set
# CONFIG_TINYCRYPT_ECC_DSA is not set
# CONFIG_TINYCRYPT_SHA256 is not set

CONFIG_FLASH=y
CONFIG_FPROTECT=y

### Various Zephyr boards enable features that we don't want.
# CONFIG_BT is not set
# CONFIG_BT_CTLR is not set
# CONFIG_I2C is not set

CONFIG_LOG=y
Expand Down
1 change: 0 additions & 1 deletion applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
CONFIG_BT_MAX_CONN=6

CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
CONFIG_EXCEPTION_STACK_TRACE=y

# Improve debugging experience by disabling reset on fatal error
Expand Down
1 change: 0 additions & 1 deletion applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#

CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
CONFIG_EXCEPTION_STACK_TRACE=y

# Improve debugging experience by disabling reset on fatal error
Expand Down
1 change: 0 additions & 1 deletion applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#

CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
CONFIG_EXCEPTION_STACK_TRACE=y

# Improve debugging experience by disabling reset on fatal error
Expand Down
1 change: 0 additions & 1 deletion applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#

CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
CONFIG_EXCEPTION_STACK_TRACE=y

# Improve debugging experience by disabling reset on fatal error
Expand Down
1 change: 0 additions & 1 deletion applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#

CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
CONFIG_EXCEPTION_STACK_TRACE=y

# Improve debugging experience by disabling reset on fatal error
Expand Down
1 change: 0 additions & 1 deletion applications/machine_learning/sysbuild/ipc_radio/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ CONFIG_BT_HCI_RAW=y
CONFIG_BT_CTLR_ASSERT_HANDLER=y

CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
CONFIG_EXCEPTION_STACK_TRACE=y

CONFIG_IPC_RADIO_BT=y
Expand Down
7 changes: 0 additions & 7 deletions applications/machine_learning/sysbuild/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,11 @@ CONFIG_BOOT_BOOTSTRAP=n
### mbedTLS has its own heap
# CONFIG_HEAP_MEM_POOL_SIZE is not set

### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed,
### MCUboot has its own copy in tree.
# CONFIG_TINYCRYPT is not set
# CONFIG_TINYCRYPT_ECC_DSA is not set
# CONFIG_TINYCRYPT_SHA256 is not set

CONFIG_FLASH=y
CONFIG_FPROTECT=y

### Various Zephyr boards enable features that we don't want.
# CONFIG_BT is not set
# CONFIG_BT_CTLR is not set
# CONFIG_I2C is not set

CONFIG_LOG=y
Expand Down
1 change: 0 additions & 1 deletion applications/matter_bridge/sysbuild/ipc_radio/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ CONFIG_BT_CTLR_PHY_2M=n

# Debug and assert configuration
CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
CONFIG_RESET_ON_FATAL_ERROR=n
CONFIG_REBOOT=n

Expand Down
9 changes: 5 additions & 4 deletions applications/matter_weather_station/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,11 @@ CONFIG_SHELL=y
CONFIG_SHELL_LOG_BACKEND=y

# Configure USB CDC ACM
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Matter Weather"
CONFIG_USB_DEVICE_VID=0x1915
CONFIG_USB_DEVICE_PID=0x530D
CONFIG_USB_DEVICE_STACK_NEXT=y
CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA"
CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Thingy:53 Matter Weather"
CONFIG_CDC_ACM_SERIAL_VID=0x1915
CONFIG_CDC_ACM_SERIAL_PID=0x530D
CONFIG_UART_LINE_CTRL=y
CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51

Expand Down
1 change: 0 additions & 1 deletion applications/matter_weather_station/sysbuild/ipc_radio/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ CONFIG_BT_CTLR_PHY_2M=n

# Debug and assert configuration
CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
CONFIG_RESET_ON_FATAL_ERROR=n
CONFIG_REBOOT=n

Expand Down
4 changes: 3 additions & 1 deletion applications/nrf5340_audio/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ CONFIG_SAMPLE_RATE_CONVERTER_FILTER_SIMPLE=y

# General
CONFIG_DEBUG=y
CONFIG_DEBUG_INFO=y
CONFIG_ASSERT=y
CONFIG_STACK_USAGE=y
CONFIG_THREAD_RUNTIME_STATS=y
Expand Down Expand Up @@ -76,3 +75,6 @@ CONFIG_BT_HCI_CORE_LOG_LEVEL_WRN=y
CONFIG_BT_ISO_TX_BUF_COUNT=3
CONFIG_BT_BUF_ACL_TX_COUNT=3
CONFIG_BT_ATT_TX_COUNT=12

# Suppress the USB deprecation warning
CONFIG_DEPRECATION_TEST=y
5 changes: 4 additions & 1 deletion applications/nrf5340_audio/prj_fota.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ CONFIG_SAMPLE_RATE_CONVERTER_FILTER_SIMPLE=y

# General
CONFIG_DEBUG=y
CONFIG_DEBUG_INFO=y
CONFIG_ASSERT=y
CONFIG_STACK_USAGE=y
CONFIG_THREAD_RUNTIME_STATS=y
Expand Down Expand Up @@ -87,3 +86,7 @@ CONFIG_SPI_NOR_SFDP_DEVICETREE=y
CONFIG_BT_ISO_TX_BUF_COUNT=3
CONFIG_BT_BUF_ACL_TX_COUNT=3
CONFIG_BT_ATT_TX_COUNT=12


# Suppress the USB deprecation warning
CONFIG_DEPRECATION_TEST=y
4 changes: 4 additions & 0 deletions applications/nrf5340_audio/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,7 @@ CONFIG_BT_ATT_TX_COUNT=12
# USB VID and PID must be changed before production.
# CONFIG_USB_DEVICE_VID=0x1915
# CONFIG_USB_DEVICE_PID=0x530A


# Suppress the USB deprecation warning
CONFIG_DEPRECATION_TEST=y
2 changes: 1 addition & 1 deletion applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ static bool is_any_active_streams(void)
{
for (int i = 0; i < ARRAY_SIZE(audio_streams); i++) {
if (audio_streams[i].ep != NULL &&
audio_streams[i].ep->status.state == BT_BAP_EP_STATE_STREAMING) {
audio_streams[i].ep->state == BT_BAP_EP_STATE_STREAMING) {
return true;
}
}
Expand Down
7 changes: 0 additions & 7 deletions applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,11 @@ CONFIG_BOOT_BOOTSTRAP=n
### mbedTLS has its own heap
# CONFIG_HEAP_MEM_POOL_SIZE is not set

### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed,
### MCUboot has its own copy in tree.
# CONFIG_TINYCRYPT is not set
# CONFIG_TINYCRYPT_ECC_DSA is not set
# CONFIG_TINYCRYPT_SHA256 is not set

CONFIG_FLASH=y
CONFIG_FPROTECT=y

### Various Zephyr boards enable features that we don't want.
# CONFIG_BT is not set
# CONFIG_BT_CTLR is not set
# CONFIG_I2C is not set

CONFIG_LOG=y
Expand Down
3 changes: 3 additions & 0 deletions applications/nrf_desktop/board_configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ nRF52840 USB Dongle (``nrf52840dongle/nrf52840``) and nRF52833 USB Dongle (``nrf
* Bluetooth uses Nordic Semiconductor's SoftDevice link layer and is configured to act as a central.
Input data comes from Bluetooth and is retransmitted to USB.
* The configuration with the B0 bootloader is set as default for the ``nrf52840dongle/nrf52840`` board and with the MCUboot bootloader is set as default for the ``nrf52833dongle`` board.
* The nRF5 MBR partition (``nrf5_mbr``) added by the ``nrf52840dongle/nrf52840`` board is not used.
It is statically defined with address and size both set to zero to prevent Partition Manager from trying to place it dynamically.
The application did not switch to the ``bare`` board variant to keep backwards compatibility.
Comment on lines +96 to +98
Copy link
Copy Markdown
Contributor

@nordicjm nordicjm Sep 23, 2025

Choose a reason for hiding this comment

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

@MarekPieta no, this needs to switch to the bare variant, the non bare variant is with nRF5 bootloader

Copy link
Copy Markdown
Contributor

@MarekPieta MarekPieta Sep 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This was added to fix the issue during the upmerge. I am discussing the way of moving forward with @pdunaj. If necessary, we will revert the commit and switch to the bare variant after the upmerge is done.

Copy link
Copy Markdown
Contributor

@MarekPieta MarekPieta Sep 23, 2025

Choose a reason for hiding this comment

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

I fully agree that bare variant is better for new applications. In case of nRF Desktop, we need to take into account backwards compatibility and consistency with nRF52820dongle and nRF52833dongle (app-specific boards).

Copy link
Copy Markdown
Contributor

@carlescufi carlescufi Sep 23, 2025

Choose a reason for hiding this comment

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

Needs to be done as a follow-up PR @nordicjm and @MarekPieta


nRF52820 USB Dongle (``nrf52820dongle``)
* The application is configured to act as a dongle that forwards data from both mouse and keyboard.
Expand Down
3 changes: 3 additions & 0 deletions ...cations/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ CONFIG_GPIO=y
CONFIG_GPIO_NRFX_INTERRUPT=n
CONFIG_MCUBOOT_SERIAL=y
CONFIG_BOOT_SERIAL_CDC_ACM=y
# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
# Disable deprecation warnings to workaround build failures in CI.
CONFIG_DEPRECATION_TEST=y
CONFIG_BOOT_SERIAL_UART=n

# Required by USB
Expand Down
2 changes: 2 additions & 0 deletions applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
CONFIG_CAF_LEDS=y

CONFIG_DESKTOP_ROLE_HID_DONGLE=y
# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
CONFIG_DEPRECATION_TEST=y
CONFIG_DESKTOP_DEVICE_PID=0x52E1

CONFIG_DESKTOP_BLE_PEER_CONTROL=y
Expand Down
2 changes: 2 additions & 0 deletions applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
CONFIG_CAF_LEDS=y

CONFIG_DESKTOP_ROLE_HID_DONGLE=y
# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
CONFIG_DEPRECATION_TEST=y
CONFIG_DESKTOP_DEVICE_PID=0x52E1

CONFIG_DESKTOP_BLE_PEER_CONTROL=y
Expand Down
3 changes: 3 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ CONFIG_GPIO=y
CONFIG_GPIO_NRFX_INTERRUPT=n
CONFIG_MCUBOOT_SERIAL=y
CONFIG_BOOT_SERIAL_CDC_ACM=y
# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
# Disable deprecation warnings to workaround build failures in CI.
CONFIG_DEPRECATION_TEST=y
CONFIG_BOOT_SERIAL_UART=n

# Required by USB
Expand Down
2 changes: 2 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
CONFIG_CAF_LEDS=y

CONFIG_DESKTOP_ROLE_HID_DONGLE=y
# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
CONFIG_DEPRECATION_TEST=y
CONFIG_DESKTOP_DEVICE_PID=0x52E1

CONFIG_DESKTOP_BLE_PEER_CONTROL=y
Expand Down
2 changes: 2 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
CONFIG_CAF_LEDS=y

CONFIG_DESKTOP_ROLE_HID_DONGLE=y
# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
CONFIG_DEPRECATION_TEST=y
CONFIG_DESKTOP_DEVICE_PID=0x52E1

CONFIG_DESKTOP_BLE_PEER_CONTROL=y
Expand Down
3 changes: 3 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ CONFIG_GPIO=y
CONFIG_GPIO_NRFX_INTERRUPT=n
CONFIG_MCUBOOT_SERIAL=y
CONFIG_BOOT_SERIAL_CDC_ACM=y
# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
# Disable deprecation warnings to workaround build failures in CI.
CONFIG_DEPRECATION_TEST=y
CONFIG_BOOT_SERIAL_UART=n

# Required by USB
Expand Down
3 changes: 3 additions & 0 deletions ...ations/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ CONFIG_GPIO=y
CONFIG_GPIO_NRFX_INTERRUPT=n
CONFIG_MCUBOOT_SERIAL=y
CONFIG_BOOT_SERIAL_CDC_ACM=y
# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
# Disable deprecation warnings to workaround build failures in CI.
CONFIG_DEPRECATION_TEST=y
CONFIG_BOOT_SERIAL_UART=n

# Required by USB
Expand Down
3 changes: 3 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ CONFIG_GPIO=y
CONFIG_GPIO_NRFX_INTERRUPT=n
CONFIG_MCUBOOT_SERIAL=y
CONFIG_BOOT_SERIAL_CDC_ACM=y
# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
# Disable deprecation warnings to workaround build failures in CI.
CONFIG_DEPRECATION_TEST=y
CONFIG_BOOT_SERIAL_UART=n

# Required by USB
Expand Down
2 changes: 2 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
CONFIG_CAF_LEDS=y

CONFIG_DESKTOP_ROLE_HID_DONGLE=y
# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
CONFIG_DEPRECATION_TEST=y
CONFIG_DESKTOP_DEVICE_PID=0x52DC

CONFIG_DESKTOP_BLE_PEER_CONTROL=y
Expand Down
2 changes: 2 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
CONFIG_CAF_LEDS=y

CONFIG_DESKTOP_ROLE_HID_DONGLE=y
# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
CONFIG_DEPRECATION_TEST=y
CONFIG_DESKTOP_DEVICE_PID=0x52E1

CONFIG_DESKTOP_BLE_PEER_CONTROL=y
Expand Down
2 changes: 2 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
CONFIG_CAF_LEDS=y

CONFIG_DESKTOP_ROLE_HID_DONGLE=y
# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
CONFIG_DEPRECATION_TEST=y
CONFIG_DESKTOP_DEVICE_PID=0x52DC

CONFIG_DESKTOP_BLE_PEER_CONTROL=y
Expand Down
3 changes: 3 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ CONFIG_GPIO=y
CONFIG_GPIO_NRFX_INTERRUPT=n
CONFIG_MCUBOOT_SERIAL=y
CONFIG_BOOT_SERIAL_CDC_ACM=y
# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
# Disable deprecation warnings to workaround build failures in CI.
CONFIG_DEPRECATION_TEST=y
CONFIG_BOOT_SERIAL_UART=n

# Required by USB
Expand Down
3 changes: 3 additions & 0 deletions ...cations/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ CONFIG_GPIO=y
CONFIG_GPIO_NRFX_INTERRUPT=n
CONFIG_MCUBOOT_SERIAL=y
CONFIG_BOOT_SERIAL_CDC_ACM=y
# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
# Disable deprecation warnings to workaround build failures in CI.
CONFIG_DEPRECATION_TEST=y
CONFIG_BOOT_SERIAL_UART=n

# Required by USB
Expand Down
2 changes: 2 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
CONFIG_CAF_LEDS=y

CONFIG_DESKTOP_ROLE_HID_DONGLE=y
# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
CONFIG_DEPRECATION_TEST=y
CONFIG_DESKTOP_DEVICE_PID=0x52E1

CONFIG_DESKTOP_BLE_PEER_CONTROL=y
Expand Down
Loading
Loading