Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions applications/nrf_desktop/board_configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions applications/nrf_desktop/description.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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``
Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/doc/ble_discovery.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/doc/ble_qos.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <config_desktop_app_options>` Kconfig option to enable real-time QoS information printouts through the USB CDC ACM port.
The :ref:`CONFIG_DESKTOP_USB_STACK_LEGACY <config_desktop_app_options>` 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`
Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/doc/ble_scan.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
32 changes: 16 additions & 16 deletions applications/nrf_desktop/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ tests:
- nrf52833dk/nrf52833
- nrf52833dongle/nrf52833
- nrf52840dk/nrf52840
- nrf52840dongle/nrf52840
- nrf52840dongle/nrf52840/bare
- nrf52840gmouse/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15dk/nrf54l05/cpuapp
Expand All @@ -57,7 +57,7 @@ tests:
- nrf52833dk/nrf52833
- nrf52833dongle/nrf52833
- nrf52840dk/nrf52840
- nrf52840dongle/nrf52840
- nrf52840dongle/nrf52840/bare
- nrf52840gmouse/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15dk/nrf54l05/cpuapp
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -209,7 +209,7 @@ tests:
- nrf52833dk/nrf52833
- nrf52833dongle/nrf52833
- nrf52840dk/nrf52840
- nrf52840dongle/nrf52840
- nrf52840dongle/nrf52840/bare
- nrf52840gmouse/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54h20dk/nrf54h20/cpuapp
Expand All @@ -227,7 +227,7 @@ tests:
- nrf52833dk/nrf52833
- nrf52833dongle/nrf52833
- nrf52840dk/nrf52840
- nrf52840dongle/nrf52840
- nrf52840dongle/nrf52840/bare
- nrf52840gmouse/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54h20dk/nrf54h20/cpuapp
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
22 changes: 18 additions & 4 deletions doc/nrf/app_dev/board_names.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <zephyr:glossary>` - 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 <nrf52840dongle>`.

* 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) <ug_tfm>` 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) <ug_tfm>`).
* 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) <ug_tfm>` in SPE and merges it with NSPE.

Expand Down Expand Up @@ -125,6 +137,8 @@ Also see the :ref:`zephyr:boards` section in the Zephyr documentation.
| | | :ref:`nrf52840dk <zephyr:nrf52840dk_nrf52811>` | ``nrf52840dk/nrf52811`` |
+-------------------+------------+-----------------------------------------------------+-----------------------------------------------------------------------+
| nRF52840 Dongle | PCA10059 | :zephyr:board:`nrf52840dongle <nrf52840dongle>` | ``nrf52840dongle/nrf52840`` |
| | | | |
| | | | ``nrf52840dongle/nrf52840/bare`` |
+-------------------+------------+-----------------------------------------------------+-----------------------------------------------------------------------+
| nRF52833 DK | PCA10100 | :zephyr:board:`nrf52833dk <nrf52833dk>` | ``nrf52833dk/nrf52833`` |
| | | | |
Expand Down
3 changes: 2 additions & 1 deletion doc/nrf/app_dev/device_guides/nrf52/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ Zephyr and the |NCS| provide support and contain board definitions for developin
- `Product Specification <nRF52805 Product Specification_>`_
* - :zephyr:board:`nrf52840dongle`
- PCA10059
- ``nrf52840dongle/nrf52840``
- | ``nrf52840dongle/nrf52840``
| ``nrf52840dongle/nrf52840/bare``
- | `Product Specification <nRF52840 Product Specification_>`_
| `User Guide <nRF52840 Dongle User Guide_>`_
* - :zephyr:board:`nrf21540dk`
Expand Down
4 changes: 4 additions & 0 deletions doc/nrf/includes/sample_board_rows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@

| :ref:`nRF52840 Dongle <ug_nrf52>` | PCA10059 | :zephyr:board:`nrf52840dongle <nrf52840dongle>` | ``nrf52840dongle/nrf52840`` |

.. nrf52840dongle_nrf52840_bare

| nRF52840 Dongle (:ref:`variant without onboard USB bootloader <app_boards>`) | PCA10059 | :zephyr:board:`nrf52840dongle <nrf52840dongle>` | ``nrf52840dongle/nrf52840/bare`` |

.. nrf9160dk_nrf9160

| :ref:`nRF9160 DK <ug_nrf9160>` | PCA10090 | :ref:`nrf9160dk <zephyr:nrf9160dk_nrf9160>` | ``nrf9160dk/nrf9160`` |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
-----------------------------------
Expand Down
4 changes: 2 additions & 2 deletions west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down