From 345bf8fb64be1ef2ffd555f5cf513c55bdecbec4 Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Tue, 6 Apr 2021 19:55:52 +0200 Subject: [PATCH] boards: nrf9160 DK: update board documentation for TF-M Minor updates to the documentation of the nRF9160 DK board, stressing that TF-M is the default Secure firmware binary for non-secure nRF9160 builds. Signed-off-by: Ioannis Glaropoulos --- boards/arm/nrf9160dk_nrf9160/doc/index.rst | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/boards/arm/nrf9160dk_nrf9160/doc/index.rst b/boards/arm/nrf9160dk_nrf9160/doc/index.rst index 6da7dd22a96..a079f669da5 100644 --- a/boards/arm/nrf9160dk_nrf9160/doc/index.rst +++ b/boards/arm/nrf9160dk_nrf9160/doc/index.rst @@ -156,13 +156,17 @@ image. The Secure image can be built using either Zephyr or `Trusted Firmware M`_ (TF-M). Non-Secure firmware images are always built using Zephyr. The two alternatives are described below. +.. note:: + + By default the Secure image for nRF9160 is built using TF-M. + Building the Secure firmware using Zephyr ----------------------------------------- The process requires the following steps: 1. Build the Secure Zephyr application using ``-DBOARD=nrf9160dk_nrf9160`` and - ``CONFIG_TRUSTED_EXECUTION_SECURE=y`` in the the application project configuration file. + ``CONFIG_TRUSTED_EXECUTION_SECURE=y`` in the application project configuration file. 2. Build the Non-Secure Zephyr application using ``-DBOARD=nrf9160dk_nrf9160ns``. 3. Merge the two binaries together. @@ -172,9 +176,11 @@ Building the Secure firmware with TF-M The process to build the Secure firmware image using TF-M and the Non-Secure firmware image using Zephyr requires the following action: -* Build the Non-Secure Zephyr application - using ``-DBOARD=nrf9160dk_nrf9160ns`` and - ``CONFIG_BUILD_WITH_TFM=y`` in the application project configuration file. +1. Build the Non-Secure Zephyr application + using ``-DBOARD=nrf9160dk_nrf9160ns``. + To invoke the building of TF-M the Zephyr build system requires the + Kconfig option ``BUILD_WITH_TFM`` to be enabled, which is done by + default when building Zephyr as a Non-Secure application. The Zephyr build system will perform the following steps automatically: * Build the Non-Secure firmware image as a regular Zephyr application