Skip to content
Open
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
3 changes: 3 additions & 0 deletions applications/nrf_desktop/board_configuration.rst
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.

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 @@ -38,3 +38,6 @@ s1_image:
settings_storage:
address: 0xfe000
size: 0x2000
nrf5_mbr:
address: 0x0
size: 0x0
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ s1_image:
settings_storage:
address: 0xfe000
size: 0x2000
nrf5_mbr:
address: 0x0
size: 0x0
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ s1_image:
settings_storage:
address: 0xfe000
size: 0x2000
nrf5_mbr:
address: 0x0
size: 0x0
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ s1_image:
settings_storage:
address: 0xfe000
size: 0x2000
nrf5_mbr:
address: 0x0
size: 0x0
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ s1_image:
settings_storage:
address: 0xfe000
size: 0x2000
nrf5_mbr:
address: 0x0
size: 0x0
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
28 changes: 21 additions & 7 deletions doc/nrf/app_dev/board_names.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,27 @@ 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:

* 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.
* 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>`.

Read more about separation of processing environments on the :ref:`ug_tfm_security_by_separation` page.
* 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.

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.

Read more about separation of processing environments on the :ref:`ug_tfm_security_by_separation` page.

.. note::
This board name scheme was introduced in the |NCS| before the v2.7.0 release following changes in Zephyr v3.6.0.
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
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
Loading