From b3fdf754985a4c3d2f297404827c70499c0312f1 Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Mon, 30 Jun 2025 17:10:30 +0200 Subject: [PATCH] applications: Migrate to the new board variant Use nRF52840 dongle board variant for applications that overwrite nRF5 SDK bootloader. Ref: NCSDK-33774 Signed-off-by: Tomasz Chyrowicz --- .../nrf_desktop/board_configuration.rst | 5 +-- .../app.overlay | 0 .../app_3bleconn.overlay | 0 .../app_4llpmconn.overlay | 0 .../app_common.dtsi | 0 .../app_release_4llpmconn.overlay | 0 .../b0_private.pem | 0 .../ble_discovery_def.h | 0 .../ble_scan_def.h | 0 .../buttons_def.h | 0 .../click_detector_def.h | 0 .../images/b0/prj.conf | 2 -- .../images/b0/prj_3bleconn.conf | 2 -- .../images/b0/prj_4llpmconn.conf | 2 -- .../images/b0/prj_release.conf | 2 -- .../images/b0/prj_release_4llpmconn.conf | 2 -- .../led_state_def.h | 0 .../pm_static.yml | 0 .../pm_static_3bleconn.yml | 0 .../pm_static_4llpmconn.yml | 0 .../pm_static_release.yml | 0 .../pm_static_release_4llpmconn.yml | 0 .../port_state_def.h | 0 .../prj.conf | 3 -- .../prj_3bleconn.conf | 3 -- .../prj_4llpmconn.conf | 3 -- .../prj_release.conf | 3 -- .../prj_release_4llpmconn.conf | 3 -- .../sysbuild.conf | 0 .../sysbuild_3bleconn.conf | 0 .../sysbuild_4llpmconn.conf | 0 .../sysbuild_release.conf | 0 .../sysbuild_release_4llpmconn.conf | 0 applications/nrf_desktop/description.rst | 8 ++--- .../nrf_desktop/doc/ble_discovery.rst | 2 +- applications/nrf_desktop/doc/ble_qos.rst | 2 +- applications/nrf_desktop/doc/ble_scan.rst | 2 +- applications/nrf_desktop/sample.yaml | 32 +++++++++---------- doc/nrf/app_dev/board_names.rst | 22 ++++++++++--- doc/nrf/app_dev/device_guides/nrf52/index.rst | 3 +- doc/nrf/includes/sample_board_rows.txt | 4 +++ .../releases/release-notes-changelog.rst | 4 ++- west.yml | 4 +-- 43 files changed, 55 insertions(+), 58 deletions(-) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/app.overlay (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/app_3bleconn.overlay (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/app_4llpmconn.overlay (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/app_common.dtsi (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/app_release_4llpmconn.overlay (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/b0_private.pem (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/ble_discovery_def.h (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/ble_scan_def.h (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/buttons_def.h (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/click_detector_def.h (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/images/b0/prj.conf (97%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/images/b0/prj_3bleconn.conf (97%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/images/b0/prj_4llpmconn.conf (97%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/images/b0/prj_release.conf (97%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/images/b0/prj_release_4llpmconn.conf (97%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/led_state_def.h (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/pm_static.yml (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/pm_static_3bleconn.yml (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/pm_static_4llpmconn.yml (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/pm_static_release.yml (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/pm_static_release_4llpmconn.yml (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/port_state_def.h (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/prj.conf (97%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/prj_3bleconn.conf (97%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/prj_4llpmconn.conf (97%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/prj_release.conf (96%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/prj_release_4llpmconn.conf (97%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/sysbuild.conf (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/sysbuild_3bleconn.conf (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/sysbuild_4llpmconn.conf (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/sysbuild_release.conf (100%) rename applications/nrf_desktop/configuration/{nrf52840dongle_nrf52840 => nrf52840dongle_nrf52840_bare}/sysbuild_release_4llpmconn.conf (100%) diff --git a/applications/nrf_desktop/board_configuration.rst b/applications/nrf_desktop/board_configuration.rst index 6bc49f157bc7..3f2d5011cd0b 100644 --- a/applications/nrf_desktop/board_configuration.rst +++ b/applications/nrf_desktop/board_configuration.rst @@ -87,12 +87,13 @@ nRF52832 Desktop Keyboard (``nrf52kbd``) * The board supports ``release`` :ref:`nrf_desktop_bluetooth_guide_fast_pair` configuration (``release_fast_pair`` file suffix). The configuration uses the MCUboot bootloader built in the direct-xip mode (``MCUBOOT+XIP``), and supports firmware updates using the :ref:`nrf_desktop_dfu` and the :ref:`nrf_desktop_dfu_mcumgr`. -nRF52840 USB Dongle (``nrf52840dongle/nrf52840``) and nRF52833 USB Dongle (``nrf52833dongle``) +nRF52840 USB Dongle (``nrf52840dongle/nrf52840/bare``) and nRF52833 USB Dongle (``nrf52833dongle``) * Since the nRF52840 Dongle is generic and defined in Zephyr, project-specific changes are applied in the DTS overlay file. * The application is configured to act as a dongle that forwards data from both mouse and keyboard. * 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. + * For the ``nrf52840dongle/nrf52840/bare`` board, the configuration using the B0 bootloader is set as the default. + For the ``nrf52833dongle`` board, the configuration using the MCUboot bootloader is set as the default. nRF52820 USB Dongle (``nrf52820dongle``) * The application is configured to act as a dongle that forwards data from both mouse and keyboard. diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/app.overlay similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app.overlay rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/app.overlay diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_3bleconn.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/app_3bleconn.overlay similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_3bleconn.overlay rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/app_3bleconn.overlay diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_4llpmconn.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/app_4llpmconn.overlay similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_4llpmconn.overlay rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/app_4llpmconn.overlay diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_common.dtsi b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/app_common.dtsi similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_common.dtsi rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/app_common.dtsi diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_release_4llpmconn.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/app_release_4llpmconn.overlay similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_release_4llpmconn.overlay rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/app_release_4llpmconn.overlay diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/b0_private.pem b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/b0_private.pem similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/b0_private.pem rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/b0_private.pem diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/ble_discovery_def.h b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/ble_discovery_def.h similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/ble_discovery_def.h rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/ble_discovery_def.h diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/ble_scan_def.h b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/ble_scan_def.h similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/ble_scan_def.h rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/ble_scan_def.h diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/buttons_def.h b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/buttons_def.h similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/buttons_def.h rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/buttons_def.h diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/click_detector_def.h b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/click_detector_def.h similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/click_detector_def.h rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/click_detector_def.h diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj.conf similarity index 97% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj.conf index 24e531697d56..8064623bb2bd 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj.conf @@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n CONFIG_UART_INTERRUPT_DRIVEN=n CONFIG_ASSERT=n -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_3bleconn.conf similarity index 97% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_3bleconn.conf index 24e531697d56..8064623bb2bd 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_3bleconn.conf @@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n CONFIG_UART_INTERRUPT_DRIVEN=n CONFIG_ASSERT=n -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_4llpmconn.conf similarity index 97% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_4llpmconn.conf index 24e531697d56..8064623bb2bd 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_4llpmconn.conf @@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n CONFIG_UART_INTERRUPT_DRIVEN=n CONFIG_ASSERT=n -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_release.conf similarity index 97% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_release.conf index 57988ce9b55e..2aec5cc33de1 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_release.conf @@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n CONFIG_UART_INTERRUPT_DRIVEN=n CONFIG_ASSERT=n -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_release_4llpmconn.conf similarity index 97% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_release_4llpmconn.conf index 57988ce9b55e..2aec5cc33de1 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/images/b0/prj_release_4llpmconn.conf @@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n CONFIG_UART_INTERRUPT_DRIVEN=n CONFIG_ASSERT=n -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/led_state_def.h b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/led_state_def.h similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/led_state_def.h rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/led_state_def.h diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/pm_static.yml similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static.yml rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/pm_static.yml diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_3bleconn.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/pm_static_3bleconn.yml similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_3bleconn.yml rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/pm_static_3bleconn.yml diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_4llpmconn.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/pm_static_4llpmconn.yml similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_4llpmconn.yml rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/pm_static_4llpmconn.yml diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/pm_static_release.yml similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release.yml rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/pm_static_release.yml diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release_4llpmconn.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/pm_static_release_4llpmconn.yml similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release_4llpmconn.yml rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/pm_static_release_4llpmconn.yml diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/port_state_def.h b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/port_state_def.h similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/port_state_def.h rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/port_state_def.h diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj.conf similarity index 97% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj.conf index c8a9b6d961d4..b780f9cf4f34 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj.conf @@ -36,9 +36,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_ROM_START_OFFSET=0 -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_3bleconn.conf similarity index 97% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_3bleconn.conf index 12910a637cee..480ba5ea1cd0 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_3bleconn.conf @@ -47,9 +47,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_ROM_START_OFFSET=0 -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_4llpmconn.conf similarity index 97% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_4llpmconn.conf index a77fd9f7282c..e894e7fa4e73 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_4llpmconn.conf @@ -46,9 +46,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_ROM_START_OFFSET=0 -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_release.conf similarity index 96% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_release.conf index 5c90497718a8..d2b11fdb984f 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_release.conf @@ -34,9 +34,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_ROM_START_OFFSET=0 -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_release_4llpmconn.conf similarity index 97% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_release_4llpmconn.conf index 1bb1bd7684e0..165ef6ab9d97 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/prj_release_4llpmconn.conf @@ -44,9 +44,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_ROM_START_OFFSET=0 -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/sysbuild.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/sysbuild.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/sysbuild_3bleconn.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_3bleconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/sysbuild_3bleconn.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/sysbuild_4llpmconn.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_4llpmconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/sysbuild_4llpmconn.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/sysbuild_release.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/sysbuild_release.conf diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/sysbuild_release_4llpmconn.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release_4llpmconn.conf rename to applications/nrf_desktop/configuration/nrf52840dongle_nrf52840_bare/sysbuild_release_4llpmconn.conf diff --git a/applications/nrf_desktop/description.rst b/applications/nrf_desktop/description.rst index e6898478dfde..a8a77acc20e2 100644 --- a/applications/nrf_desktop/description.rst +++ b/applications/nrf_desktop/description.rst @@ -357,7 +357,7 @@ Depending on the development kit you use, you need to select the respective conf .. table-from-rows:: /includes/sample_board_rows.txt :header: heading - :rows: nrf52840dongle_nrf52840, nrf52833dongle_nrf52833, nrf52820dongle_nrf52820 + :rows: nrf52840dongle_nrf52840_bare, nrf52833dongle_nrf52833, nrf52820dongle_nrf52820 .. tab:: DK @@ -437,15 +437,15 @@ The application supports the following build types: - Debug version of the application with the support for the B0 bootloader enabled for `Works With ChromeBook (WWCB)`_. * - Triple Bluetooth LE connection - ``3bleconn`` - - ``nrf52840dongle/nrf52840`` + - ``nrf52840dongle/nrf52840/bare`` - Debug version of the application with the support for up to three simultaneous Bluetooth LE connections. * - Quadruple LLPM connection - ``4llpmconn`` - - ``nrf52840dongle/nrf52840`` + - ``nrf52840dongle/nrf52840/bare`` - Debug version of the application with the support for up to four simultaneous Bluetooth LE connections, in Low Latency Packet Mode. * - Release quadruple LLPM connection - ``release_4llpmconn`` - - ``nrf52840dongle/nrf52840`` + - ``nrf52840dongle/nrf52840/bare`` - Release version of the application with the support for up to four simultaneous Bluetooth LE connections, in Low Latency Packet Mode. * - LLVM - ``llvm`` diff --git a/applications/nrf_desktop/doc/ble_discovery.rst b/applications/nrf_desktop/doc/ble_discovery.rst index 4cbb3cc4c546..f32716a7f615 100644 --- a/applications/nrf_desktop/doc/ble_discovery.rst +++ b/applications/nrf_desktop/doc/ble_discovery.rst @@ -46,7 +46,7 @@ Complete the following steps to configure the module: * Product ID (PID) * Peer type (:c:enumerator:`PEER_TYPE_MOUSE` or :c:enumerator:`PEER_TYPE_KEYBOARD`) - For an example of the module configuration, see :file:`configuration/nrf52840dongle_nrf52840/ble_discovery_def.h`. + For an example of the module configuration, see :file:`configuration/nrf52840dongle_nrf52840_bare/ble_discovery_def.h`. .. note:: The module configuration example uses ``0x1915`` as Nordic Semiconductor's VID. diff --git a/applications/nrf_desktop/doc/ble_qos.rst b/applications/nrf_desktop/doc/ble_qos.rst index 8db2b1436879..c5095128db2a 100644 --- a/applications/nrf_desktop/doc/ble_qos.rst +++ b/applications/nrf_desktop/doc/ble_qos.rst @@ -35,7 +35,7 @@ The option selects :kconfig:option:`CONFIG_BT_HCI_VS_EVT_USER`, because the modu You can use the :ref:`CONFIG_DESKTOP_BLE_QOS_STATS_PRINTOUT_ENABLE ` Kconfig option to enable real-time QoS information printouts through the USB CDC ACM port. The :ref:`CONFIG_DESKTOP_USB_STACK_LEGACY ` Kconfig option must be enabled. Also, the selected USB CDC ACM instance must be enabled, and specified in the devicetree using the ``ncs,ble-qos-uart`` DT chosen. -For an example of configuration that specifies the ``ncs,ble-qos-uart`` DT chosen, see the :file:`configuration/nrf52840dongle_nrf52840/app.overlay` file. +For an example of a configuration that specifies the ``ncs,ble-qos-uart`` DT chosen, see the :file:`configuration/nrf52840dongle_nrf52840_bare/app.overlay` file. This option automatically selects other Kconfig options needed to handle statistics printouts over the USB CDC ACM port: * :kconfig:option:`CONFIG_USB_COMPOSITE_DEVICE` diff --git a/applications/nrf_desktop/doc/ble_scan.rst b/applications/nrf_desktop/doc/ble_scan.rst index a7169459e3ae..1143a0eaf5c4 100644 --- a/applications/nrf_desktop/doc/ble_scan.rst +++ b/applications/nrf_desktop/doc/ble_scan.rst @@ -63,7 +63,7 @@ Complete the following steps to enable the |ble_scan|: By default, the nRF Desktop central connects and bonds with only one mouse and one keyboard. #. Define the Bluetooth name filters in the :file:`ble_scan_def.h` file that is located in the board-specific directory in the application configuration directory. You must define a Bluetooth name filter for every peripheral type the nRF Desktop central connects to. - For an example, see :file:`configuration/nrf52840dongle_nrf52840/ble_scan_def.h`. + For an example, see :file:`configuration/nrf52840dongle_nrf52840_bare/ble_scan_def.h`. .. note:: The Bluetooth device name for given peripheral is defined as the :kconfig:option:`CONFIG_BT_DEVICE_NAME` Kconfig option in the peripheral's configuration. diff --git a/applications/nrf_desktop/sample.yaml b/applications/nrf_desktop/sample.yaml index 55cf5d8fde03..7f8fc8d3f1e2 100644 --- a/applications/nrf_desktop/sample.yaml +++ b/applications/nrf_desktop/sample.yaml @@ -45,7 +45,7 @@ tests: - nrf52833dk/nrf52833 - nrf52833dongle/nrf52833 - nrf52840dk/nrf52840 - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare - nrf52840gmouse/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54l15dk/nrf54l05/cpuapp @@ -57,7 +57,7 @@ tests: - nrf52833dk/nrf52833 - nrf52833dongle/nrf52833 - nrf52840dk/nrf52840 - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare - nrf52840gmouse/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54l15dk/nrf54l05/cpuapp @@ -115,28 +115,28 @@ tests: - nrf52833dk/nrf52833 - nrf52833dongle/nrf52833 - nrf52840dk/nrf52840 - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare - nrf52840gmouse/nrf52840 integration_platforms: - nrf52kbd/nrf52832 - nrf52833dk/nrf52833 - nrf52833dongle/nrf52833 - nrf52840dk/nrf52840 - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare - nrf52840gmouse/nrf52840 extra_configs: - CONFIG_DESKTOP_SHELL=y applications.nrf_desktop.zdebug_3bleconn: build_only: true - platform_allow: nrf52840dongle/nrf52840 + platform_allow: nrf52840dongle/nrf52840/bare integration_platforms: - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare extra_args: FILE_SUFFIX=3bleconn applications.nrf_desktop.zdebug_4llpmconn: build_only: true - platform_allow: nrf52840dongle/nrf52840 + platform_allow: nrf52840dongle/nrf52840/bare integration_platforms: - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare extra_args: FILE_SUFFIX=4llpmconn applications.nrf_desktop.zdebug_dongle: build_only: true @@ -209,7 +209,7 @@ tests: - nrf52833dk/nrf52833 - nrf52833dongle/nrf52833 - nrf52840dk/nrf52840 - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare - nrf52840gmouse/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54h20dk/nrf54h20/cpuapp @@ -227,7 +227,7 @@ tests: - nrf52833dk/nrf52833 - nrf52833dongle/nrf52833 - nrf52840dk/nrf52840 - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare - nrf52840gmouse/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54h20dk/nrf54h20/cpuapp @@ -257,20 +257,20 @@ tests: - FILE_SUFFIX=release_fast_pair applications.nrf_desktop.zrelease_4llpmconn: build_only: true - platform_allow: nrf52840dongle/nrf52840 + platform_allow: nrf52840dongle/nrf52840/bare integration_platforms: - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare extra_args: FILE_SUFFIX=release_4llpmconn applications.nrf_desktop.zdebug.usb_next: build_only: true platform_allow: - nrf52840dk/nrf52840 - nrf52840gmouse/nrf52840 - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare integration_platforms: - nrf52840dk/nrf52840 - nrf52840gmouse/nrf52840 - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare extra_configs: - CONFIG_DESKTOP_USB_STACK_NEXT=y applications.nrf_desktop.zdebug_dongle.usb_next: @@ -293,10 +293,10 @@ tests: build_only: true platform_allow: - nrf52840dk/nrf52840 - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare integration_platforms: - nrf52840dk/nrf52840 - - nrf52840dongle/nrf52840 + - nrf52840dongle/nrf52840/bare extra_args: FILE_SUFFIX=release extra_configs: - CONFIG_DESKTOP_USB_STACK_NEXT=y diff --git a/doc/nrf/app_dev/board_names.rst b/doc/nrf/app_dev/board_names.rst index 33b78130f269..c883c08b0a7d 100644 --- a/doc/nrf/app_dev/board_names.rst +++ b/doc/nrf/app_dev/board_names.rst @@ -46,11 +46,23 @@ While the board name is always present, other elements, such as the board revisi Check the Product Specification of the given SoC for more information about the available CPU clusters. * :ref:`Variant ` - You can use this board qualifier to build for a particular type or configuration of a build for a combination of SoC and CPU cluster. - In the |NCS|, variants are used for indicating the usage of Cortex-M Security Extensions (CMSE) (security by separation): + In the |NCS|, board variants are used for the following purposes: + + * Changing the default memory map: + This applies to the entry for the nRF52840 Dongle with the ``*/bare`` variant (``nrf52840dongle/nrf52840/bare``). + When you select this target, the firmware does not account for the onboard USB bootloader. + This corresponds to using :zephyr:board:`flashing option 3 with an external debug probe `. + + * Indicating the use of Cortex-M Security Extensions (CMSE), also known as security by separation: + + * Variants without ``*/ns`` (for example, ``cpuapp``): + When you select this target, you build the application core firmware as a single execution environment without CMSE. + See :ref:`Trusted Firmware-M (TF-M) ` for more information. + + * Variants with ``*/ns`` (for example, ``cpuapp/ns``): + Recommended for enhanced security. + When you select this target, you build the application with CMSE enabled, using security by separation. - * Entries without ``*/ns`` (for example, ``cpuapp``) - When you choose this target, you build the application core firmware as a single execution environment that does not use CMSE (:ref:`Trusted Firmware-M (TF-M) `). - * Entries with ``*/ns`` (for example, ``cpuapp/ns``) - Recommended for more security. - When you choose this target, you build the application with CMSE using security by separation. The application core firmware is placed in Non-Secure Processing Environment (NSPE) and uses Secure Processing Environment (SPE) for security features. By default, the build system automatically includes :ref:`Trusted Firmware-M (TF-M) ` in SPE and merges it with NSPE. @@ -125,6 +137,8 @@ Also see the :ref:`zephyr:boards` section in the Zephyr documentation. | | | :ref:`nrf52840dk ` | ``nrf52840dk/nrf52811`` | +-------------------+------------+-----------------------------------------------------+-----------------------------------------------------------------------+ | nRF52840 Dongle | PCA10059 | :zephyr:board:`nrf52840dongle ` | ``nrf52840dongle/nrf52840`` | +| | | | | +| | | | ``nrf52840dongle/nrf52840/bare`` | +-------------------+------------+-----------------------------------------------------+-----------------------------------------------------------------------+ | nRF52833 DK | PCA10100 | :zephyr:board:`nrf52833dk ` | ``nrf52833dk/nrf52833`` | | | | | | diff --git a/doc/nrf/app_dev/device_guides/nrf52/index.rst b/doc/nrf/app_dev/device_guides/nrf52/index.rst index 55a30318694a..6f5f0752275a 100644 --- a/doc/nrf/app_dev/device_guides/nrf52/index.rst +++ b/doc/nrf/app_dev/device_guides/nrf52/index.rst @@ -55,7 +55,8 @@ Zephyr and the |NCS| provide support and contain board definitions for developin - `Product Specification `_ * - :zephyr:board:`nrf52840dongle` - PCA10059 - - ``nrf52840dongle/nrf52840`` + - | ``nrf52840dongle/nrf52840`` + | ``nrf52840dongle/nrf52840/bare`` - | `Product Specification `_ | `User Guide `_ * - :zephyr:board:`nrf21540dk` diff --git a/doc/nrf/includes/sample_board_rows.txt b/doc/nrf/includes/sample_board_rows.txt index 0d23750ec7b3..c39b93b59281 100644 --- a/doc/nrf/includes/sample_board_rows.txt +++ b/doc/nrf/includes/sample_board_rows.txt @@ -14,6 +14,10 @@ | :ref:`nRF52840 Dongle ` | PCA10059 | :zephyr:board:`nrf52840dongle ` | ``nrf52840dongle/nrf52840`` | +.. nrf52840dongle_nrf52840_bare + +| nRF52840 Dongle (:ref:`variant without onboard USB bootloader `) | PCA10059 | :zephyr:board:`nrf52840dongle ` | ``nrf52840dongle/nrf52840/bare`` | + .. nrf9160dk_nrf9160 | :ref:`nRF9160 DK ` | PCA10090 | :ref:`nrf9160dk ` | ``nrf9160dk/nrf9160`` | diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index 7ec61581ec7e..ba49ec474cbf 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -208,7 +208,9 @@ nRF5340 Audio nRF Desktop ----------- -|no_changes_yet_note| +* Updated: + + * The ``bare`` variant of the nRF52840 Dongle board target to indicate that the application does not use the onboard USB bootloader and will overwrite it. nRF Machine Learning (Edge Impulse) ----------------------------------- diff --git a/west.yml b/west.yml index 0fd14808b61f..60f41cf4834e 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 476ad665287a8b92e90ba1ec9a1ebd3241018b7a + revision: pull/3007/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -128,7 +128,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: 1b1a37fb7abf8b6e5f7d1e05daacd0081ce2844e + revision: pull/469/head path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR