michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: arm: nrf5340dk_nrf5340: Rename NS target

Browse source 
This commit updates the NS board variant from
`nrf5340dk_nrf5340_cpuappns` to `nrf5340dk_nrf5340_cpuapp_ns`
to maintain consistency across zephyr.

Signed-off-by: Kevin Townsend <kevin.townsend@linaro.org>
This commit is contained in:
Kevin Townsend 2021-07-07 11:57:38 +02:00 • committed by Anas Nashif
commit b8c9dc169e
18 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boards/arm/nrf5340dk_nrf5340/CMakeLists.txt
View file

@ -1,7 +1,7 @@
# Copyright (c) 2019 Nordic Semiconductor ASA.
# SPDX-License-Identifier: Apache-2.0
if ((CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
if ((CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS)
AND CONFIG_BOARD_ENABLE_CPUNET)
zephyr_library()
zephyr_library_sources(nrf5340_cpunet_reset.c)

6
boards/arm/nrf5340dk_nrf5340/Kconfig
View file

@ -39,7 +39,7 @@ config IPM_MSG_CH_1_RX
endif # RPMSG_SERVICE_DUAL_IPM_SUPPORT
if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
config BOARD_ENABLE_DCDC_APP
bool "Enable Application MCU DCDC converter"
@ -82,7 +82,7 @@ config BOARD_ENABLE_CPUNET
config DOMAIN_CPUNET_BOARD
string
default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
depends on BOARD_ENABLE_CPUNET
help
The board which will be used for CPUNET domain when creating a multi
@ -90,7 +90,7 @@ config DOMAIN_CPUNET_BOARD
another board. For example hci_rpmsg on the nRF5340_cpunet for
Bluetooth applications.
endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
if BOARD_NRF5340DK_NRF5340_CPUNET

2
boards/arm/nrf5340dk_nrf5340/Kconfig.board
View file

@ -8,7 +8,7 @@ if SOC_NRF5340_CPUAPP_QKAA
config BOARD_NRF5340DK_NRF5340_CPUAPP
bool "nRF5340 DK nRF5340 Application MCU"
config BOARD_NRF5340DK_NRF5340_CPUAPPNS
config BOARD_NRF5340DK_NRF5340_CPUAPP_NS
bool "nRF5340 DK nRF5340 Application MCU non-secure"
endif # SOC_NRF5340_CPUAPP_QKAA

16
boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig
View file

@ -3,16 +3,16 @@
# Copyright (c) 2019-2020 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
config BOARD
default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
# By default, if we build for a Non-Secure version of the board,
# force building with TF-M as the Secure Execution Environment.
config BUILD_WITH_TFM
default y if BOARD_NRF5340DK_NRF5340_CPUAPPNS
default y if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
if BUILD_WITH_TFM
@ -63,7 +63,7 @@ config SRAM_SIZE
endif # BOARD_NRF5340DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE
if BOARD_NRF5340DK_NRF5340_CPUAPPNS
if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
config FLASH_LOAD_OFFSET
default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
@ -71,9 +71,9 @@ config FLASH_LOAD_OFFSET
config FLASH_LOAD_SIZE
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
endif # BOARD_NRF5340DK_NRF5340_CPUAPPNS
endif # BOARD_NRF5340DK_NRF5340_CPUAPP_NS
if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS) && USB
if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS) && USB
config USB_NRFX
default y
@ -81,9 +81,9 @@ config USB_NRFX
config USB_DEVICE_STACK
default y
endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS) && USB
endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS) && USB
endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS
endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
config BOARD
default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUNET

4
boards/arm/nrf5340dk_nrf5340/board.cmake
View file

@ -1,10 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS)
set(TFM_PUBLIC_KEY_FORMAT "full")
endif()
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS)
board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
endif()

4
boards/arm/nrf5340dk_nrf5340/doc/index.rst
View file

@ -199,7 +199,7 @@ The process to build the Secure firmware image using TF-M and the Non-Secure
firmware image using Zephyr requires the following steps:
1. Build the Non-Secure Zephyr application
for the application core using ``-DBOARD=nrf5340dk_nrf5340_cpuappns``.
for the application core using ``-DBOARD=nrf5340dk_nrf5340_cpuapp_ns``.
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.
@ -231,7 +231,7 @@ using Zephyr requires the following steps:
``CONFIG_TRUSTED_EXECUTION_SECURE=y`` and ``CONFIG_BUILD_WITH_TFM=n``
in the application project configuration file.
2. Build the Non-Secure Zephyr application for the application core
using ``-DBOARD=nrf5340dk_nrf5340_cpuappns``.
using ``-DBOARD=nrf5340dk_nrf5340_cpuapp_ns``.
3. Merge the two binaries together.
4. Build the application firmware for the network core using
``-DBOARD=nrf5340dk_nrf5340_cpunet``.

0
boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuappns.dts → boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp_ns.dts
View file

2
boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuappns.yaml → boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp_ns.yaml
View file

@ -1,4 +1,4 @@
identifier: nrf5340dk_nrf5340_cpuappns
identifier: nrf5340dk_nrf5340_cpuapp_ns
name: NRF5340-DK-NRF5340-application-MCU-Non-Secure
type: mcu
arch: arm

2
boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuappns_defconfig → boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp_ns_defconfig
View file

@ -2,7 +2,7 @@
CONFIG_SOC_SERIES_NRF53X=y
CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS=y
CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS=y
# Enable MPU
CONFIG_ARM_MPU=y

2
modules/trusted-firmware-m/Kconfig.tfm
View file

@ -10,7 +10,7 @@ config ZEPHYR_TRUSTED_FIRMWARE_M_MODULE
config TFM_BOARD
string
default "nordic_nrf/nrf9160dk_nrf9160" if BOARD_NRF9160DK_NRF9160NS
default "nordic_nrf/nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPPNS
default "nordic_nrf/nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
default "nxp/lpcxpresso55s69" if BOARD_LPCXPRESSO55S69_CPU0
default "mps2/an521" if BOARD_MPS2_AN521_CPU0_NS
default "stm/nucleo_l552ze_q" if BOARD_NUCLEO_L552ZE_Q

2
samples/bluetooth/bluetooth.rst
View file

@ -18,7 +18,7 @@ documentation and are prefixed with :literal:`hci_` in their folder names.
.. note::
If you want to run any bluetooth sample on the nRF5340 device (build using
``-DBOARD=nrf5340dk_nrf5340_cpuapp`` or
``-DBOARD=nrf5340dk_nrf5340_cpuappns``) you must also build
``-DBOARD=nrf5340dk_nrf5340_cpuapp_ns``) you must also build
and program the corresponding sample for the nRF5340 network core
:ref:`bluetooth-hci-rpmsg-sample` which implements the Bluetooth
Low Energy controller.

2
samples/tfm_integration/psa_crypto/README.rst
View file

@ -184,7 +184,7 @@ On nRF5340 and nRF9160:
=======================
Build Zephyr with a non-secure configuration
(``-DBOARD=nrf5340dk_nrf5340_cpuappns`` or ``-DBOARD=nrf9160dk_nrf9160ns``).
(``-DBOARD=nrf5340dk_nrf5340_cpuapp_ns`` or ``-DBOARD=nrf9160dk_nrf9160ns``).
Example, for nRF9160, using ``cmake`` and ``ninja``

2
samples/tfm_integration/psa_crypto/sample.yaml
View file

@ -5,7 +5,7 @@ sample:
tests:
sample.psa_crypto:
tags: introduction tfm crypto
platform_allow: mps2_an521_ns lpcxpresso55s69_ns nrf5340dk_nrf5340_cpuappns
platform_allow: mps2_an521_ns lpcxpresso55s69_ns nrf5340dk_nrf5340_cpuapp_ns
nrf9160dk_nrf9160ns nucleo_l552ze_q_ns v2m_musca_s1_ns stm32l562e_dk_ns
bl5340_dvk_cpuapp_ns
harness: console

2
samples/tfm_integration/psa_protected_storage/sample.yaml
View file

@ -4,7 +4,7 @@ sample:
common:
tags: psa
platform_allow: mps2_an521_ns v2m_musca_s1_ns
nrf5340dk_nrf5340_cpuappns nrf9160dk_nrf9160ns bl5340_dvk_cpuapp_ns
nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160ns bl5340_dvk_cpuapp_ns
harness: console
harness_config:
type: multi_line

2
samples/tfm_integration/tfm_ipc/README.rst
View file

@ -171,7 +171,7 @@ On nRF5340 and nRF9160:
=======================
Build Zephyr with a non-secure configuration
(``-DBOARD=nrf5340dk_nrf5340_cpuappns`` or ``-DBOARD=nrf9160dk_nrf9160ns``).
(``-DBOARD=nrf5340dk_nrf5340_cpuapp_ns`` or ``-DBOARD=nrf9160dk_nrf9160ns``).
Example, for nRF9160, using ``cmake`` and ``ninja``

2
samples/tfm_integration/tfm_ipc/sample.yaml
View file

@ -6,7 +6,7 @@ tests:
sample.tfm_ipc:
tags: introduction tfm
platform_allow: mps2_an521_ns lpcxpresso55s69_ns
nrf5340dk_nrf5340_cpuappns nrf9160dk_nrf9160ns nucleo_l552ze_q_ns
nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160ns nucleo_l552ze_q_ns
stm32l562e_dk_ns v2m_musca_s1_ns v2m_musca_b1_ns bl5340_dvk_cpuapp_ns
harness: console
harness_config:

2
samples/tfm_integration/tfm_psa_test/sample.yaml
View file

@ -1,7 +1,7 @@
common:
tags: tfm
platform_allow: mps2_an521_ns
nrf5340dk_nrf5340_cpuappns nrf9160dk_nrf9160ns
nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160ns
v2m_musca_s1_ns
harness: console
harness_config:

2
samples/tfm_integration/tfm_regression_test/sample.yaml
View file

@ -1,7 +1,7 @@
common:
tags: tfm
platform_allow: lpcxpresso55s69_ns mps2_an521_ns
nrf5340dk_nrf5340_cpuappns nrf9160dk_nrf9160ns
nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160ns
v2m_musca_s1_ns
harness: console
harness_config: