Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TF-M and Crypto samples: add 9161 support #15409

Merged
merged 4 commits into from
May 31, 2024
Merged

TF-M and Crypto samples: add 9161 support #15409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a763215
samples: tf-m: Add nrf9161 support
juhaylinen May 16, 2024
7666d28
samples: crypto: Add missing kconfig overlays for nrf9161
juhaylinen May 17, 2024
aca27e0
tests: crypto: Add support for nrf9161
juhaylinen May 20, 2024
7db564e
doc: add changelog entry
juhaylinen May 23, 2024
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 doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,8 @@ Cryptography samples
* Added:

* :ref:`crypto_spake2p` sample.
* Support for the :ref:`zephyr:nrf9151dk_nrf9151` board for all crypto samples.
* Support for the :ref:`zephyr:nrf9151dk_nrf9151` board for all crypto samples.
* Support for the :ref:`nRF9161 DK <ug_nrf9161>` board for the :ref:`crypto_test` sample.

Debug samples
-------------
Expand Down Expand Up @@ -701,7 +702,7 @@ Sensor samples
Trusted Firmware-M (TF-M) samples
---------------------------------

* Added support for the :ref:`zephyr:nrf9151dk_nrf9151` board for all TF-M samples.
* Added support for the :ref:`zephyr:nrf9151dk_nrf9151` and the :ref:`nRF9161 DK <ug_nrf9161>` boards for all TF-M samples (except for the :ref:`provisioning_image_net_core` sample).

Thread samples
--------------
Expand Down
9 changes: 9 additions & 0 deletions samples/crypto/ecjpake/boards/nrf9161dk_nrf9161.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Using software crypto
CONFIG_PSA_CRYPTO_DRIVER_OBERON=y
CONFIG_PSA_CRYPTO_DRIVER_CC3XX=n
7 changes: 7 additions & 0 deletions samples/crypto/ecjpake/boards/nrf9161dk_nrf9161_ns.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
1 change: 1 addition & 0 deletions samples/crypto/rng/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=4096
# Enable logging
CONFIG_CONSOLE=y
CONFIG_LOG=y
CONFIG_LOG_MODE_IMMEDIATE=y

# Enable nordic security backend and PSA APIs
CONFIG_NRF_SECURITY=y
Expand Down
6 changes: 3 additions & 3 deletions samples/crypto/rsa/boards/nrf9161dk_nrf9161.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
#
CONFIG_SRAM_SIZE=256

# Using hardware crypto accelerator
CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y
# Using Oberon software crypto
CONFIG_PSA_CRYPTO_DRIVER_OBERON=y
CONFIG_PSA_CRYPTO_DRIVER_CC3XX=n
1 change: 1 addition & 0 deletions samples/crypto/rsa/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=16384
# Enable logging
CONFIG_CONSOLE=y
CONFIG_LOG=y
CONFIG_LOG_MODE_IMMEDIATE=y

# Enable nordic security backend and PSA APIs
CONFIG_NRF_SECURITY=y
Expand Down
7 changes: 7 additions & 0 deletions samples/crypto/spake2p/boards/nrf9161dk_nrf9161_ns.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
9 changes: 7 additions & 2 deletions samples/tfm/provisioning_image/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ sample:
name: Provisioning Image
common:
tags: keys
platform_allow: nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf9151dk/nrf9151
integration_platforms:
platform_allow:
- nrf5340dk/nrf5340/cpuapp
- nrf9151dk/nrf9151
- nrf9160dk/nrf9160
- nrf9161dk/nrf9161
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
- nrf9151dk/nrf9151
- nrf9160dk/nrf9160
- nrf9161dk/nrf9161
harness: console
harness_config:
type: multi_line
Expand Down
7 changes: 7 additions & 0 deletions samples/tfm/tfm_hello_world/boards/nrf9161dk_nrf9161_ns.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_FPU=y
8 changes: 5 additions & 3 deletions samples/tfm/tfm_hello_world/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ common:
tags: tfm
platform_allow:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9160dk/nrf9160/ns
- nrf9151dk/nrf9151/ns
- nrf54l15pdk/nrf54l15/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
integration_platforms:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9160dk/nrf9160/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
harness: console
harness_config:
type: multi_line
Expand Down
7 changes: 7 additions & 0 deletions samples/tfm/tfm_psa_template/boards/nrf9161dk_nrf9161_ns.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_FPU=y
9 changes: 7 additions & 2 deletions samples/tfm/tfm_psa_template/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ sample:
name: TF-M PSA Template
common:
tags: tfm
platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns nrf9151dk/nrf9151/ns
integration_platforms:
platform_allow:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
integration_platforms:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
tests:
sample.tfm.psa_template:
sysbuild: true
Expand Down
8 changes: 8 additions & 0 deletions samples/tfm/tfm_secure_peripheral/boards/nrf9161dk_nrf9161_ns.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#
CONFIG_FPU=y
# P0: 8 (button0), 11 (SPIM_MOSI), 13 (SPIM_SCK)
CONFIG_NRF_GPIO0_PIN_MASK_SECURE=0x00002900
7 changes: 7 additions & 0 deletions samples/tfm/tfm_secure_peripheral/boards/nrf9161dk_nrf9161_ns.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include "nrf9160dk_nrf9160_ns.overlay"
9 changes: 7 additions & 2 deletions samples/tfm/tfm_secure_peripheral/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ sample:
TF-M sample demonstrating use of secure peripherals in a secure partition
common:
tags: tfm
platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns nrf9151dk/nrf9151/ns
integration_platforms:
platform_allow:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
integration_platforms:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
harness: console
harness_config:
type: multi_line
Expand Down
2 changes: 1 addition & 1 deletion tests/crypto/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The tests support the following development kits:

.. table-from-rows:: /includes/sample_board_rows.txt
:header: heading
:rows: nrf5340dk_nrf5340_cpuapp, nrf9160dk_nrf9160, nrf9151dk_nrf9151, nrf52840dk_nrf52840
:rows: nrf52840dk_nrf52840, nrf5340dk_nrf5340_cpuapp, nrf9151dk_nrf9151, nrf9160dk_nrf9160, nrf9161dk_nrf9161

.. note::
Nordic Semiconductor devices for nRF51 Series, nRF52810, or nRF52811 cannot run the full test suite because of limited flash capacity.
Expand Down
20 changes: 16 additions & 4 deletions tests/crypto/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,18 @@ tests:
crypto.cc3xx:
sysbuild: true
extra_args: OVERLAY_CONFIG=overlay-cc3xx.conf
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf9151dk/nrf9151
integration_platforms:
platform_allow:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf9151dk/nrf9151
- nrf9160dk/nrf9160
- nrf9161dk/nrf9161
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf9151dk/nrf9151
- nrf9160dk/nrf9160
- nrf9161dk/nrf9161
tags: crypto ci_build legacy cc3xx_legacy sysbuild
harness_config:
type: multi_line
Expand All @@ -17,12 +23,18 @@ tests:
crypto.oberon:
sysbuild: true
extra_args: OVERLAY_CONFIG=overlay-oberon.conf
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160 nrf9151dk/nrf9151
integration_platforms:
platform_allow:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf9151dk/nrf9151
- nrf9160dk/nrf9160
- nrf9161dk/nrf9161
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf9151dk/nrf9151
- nrf9160dk/nrf9160
- nrf9161dk/nrf9161
tags: crypto ci_build legacy oberon_legacy sysbuild
harness_config:
type: multi_line
Expand Down
11 changes: 8 additions & 3 deletions tests/tfm/secure_services/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
tests:
tfm.secure_services:
sysbuild: true
platform_allow: nrf9160dk/nrf9160/ns nrf9151dk/nrf9151/ns nrf5340dk/nrf5340/cpuapp/ns
platform_allow:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
tags: tfm secure_services sysbuild
integration_platforms:
- nrf9160dk/nrf9160/ns
- nrf9151dk/nrf9151/ns
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
2 changes: 1 addition & 1 deletion tests/tfm/tfm_psa_test/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The test supports the following development kits:

.. table-from-rows:: /includes/sample_board_rows.txt
:header: heading
:rows: nrf5340dk_nrf5340_cpuapp_ns, nrf9160dk_nrf9160_ns, nrf9151dk_nrf9151_ns
:rows: nrf5340dk_nrf5340_cpuapp_ns, nrf9151dk_nrf9151_ns, nrf9160dk_nrf9160_ns, nrf9161dk_nrf9161_ns

Overview
********
Expand Down
48 changes: 30 additions & 18 deletions tests/tfm/tfm_psa_test/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ tests:
timeout: 130
platform_allow: >
nrf5340dk/nrf5340/cpuapp/ns
nrf9160dk/nrf9160/ns
nrf9151dk/nrf9151/ns
nrf54l15pdk/nrf54l15/cpuapp/ns
nrf9151dk/nrf9151/ns
nrf9160dk/nrf9160/ns
nrf9161dk/nrf9161/ns
integration_platforms:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9160dk/nrf9160/ns
- nrf9151dk/nrf9151/ns
- nrf54l15pdk/nrf54l15/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
tfm.psa_test_storage_lvl2:
sysbuild: true
tags: tfm_lvl2 sysbuild
Expand All @@ -33,14 +35,16 @@ tests:
timeout: 130
platform_allow: >
nrf5340dk/nrf5340/cpuapp/ns
nrf9160dk/nrf9160/ns
nrf9151dk/nrf9151/ns
nrf54l15pdk/nrf54l15/cpuapp/ns
nrf9151dk/nrf9151/ns
nrf9160dk/nrf9160/ns
nrf9161dk/nrf9161/ns
integration_platforms:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9160dk/nrf9160/ns
- nrf9151dk/nrf9151/ns
- nrf54l15pdk/nrf54l15/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
tfm.psa_test_crypto_lvl1:
sysbuild: true
tags: tfm_lvl1 sysbuild
Expand All @@ -50,14 +54,16 @@ tests:
timeout: 120
platform_allow: >
nrf5340dk/nrf5340/cpuapp/ns
nrf9160dk/nrf9160/ns
nrf9151dk/nrf9151/ns
nrf54l15pdk/nrf54l15/cpuapp/ns
nrf9151dk/nrf9151/ns
nrf9160dk/nrf9160/ns
nrf9161dk/nrf9161/ns
integration_platforms:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9160dk/nrf9160/ns
- nrf9151dk/nrf9151/ns
- nrf54l15pdk/nrf54l15/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
tfm.psa_test_crypto_lvl2:
sysbuild: true
tags: tfm_lvl2 sysbuild
Expand All @@ -66,12 +72,14 @@ tests:
timeout: 120
platform_allow: >
nrf5340dk/nrf5340/cpuapp/ns
nrf9160dk/nrf9160/ns
nrf9151dk/nrf9151/ns
nrf9160dk/nrf9160/ns
nrf9161dk/nrf9161/ns
integration_platforms:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9160dk/nrf9160/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
tfm.psa_test_initial_attestation_lvl1:
sysbuild: true
tags: tfm_lvl1 sysbuild
Expand All @@ -82,12 +90,14 @@ tests:
- CONFIG_TFM_NRF_PROVISIONING=y
platform_allow: >
nrf5340dk/nrf5340/cpuapp/ns
nrf9160dk/nrf9160/ns
nrf9151dk/nrf9151/ns
nrf9160dk/nrf9160/ns
nrf9161dk/nrf9161/ns
integration_platforms:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9160dk/nrf9160/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
tfm.psa_test_initial_attestation_lvl2:
sysbuild: true
tags: tfm_lvl2 sysbuild
Expand All @@ -97,9 +107,11 @@ tests:
- CONFIG_TFM_NRF_PROVISIONING=y
platform_allow: >
nrf5340dk/nrf5340/cpuapp/ns
nrf9160dk/nrf9160/ns
nrf9151dk/nrf9151/ns
nrf9160dk/nrf9160/ns
nrf9161dk/nrf9161/ns
integration_platforms:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9160dk/nrf9160/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
2 changes: 1 addition & 1 deletion tests/tfm/tfm_regression_test/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The tests support the following development kits:

.. table-from-rows:: /includes/sample_board_rows.txt
:header: heading
:rows: nrf5340dk_nrf5340_cpuapp_ns, nrf9160dk_nrf9160_ns, nrf9151dk_nrf9151_ns
:rows: nrf5340dk_nrf5340_cpuapp_ns, nrf9151dk_nrf9151_ns, nrf9160dk_nrf9160_ns, nrf9161dk_nrf9161_ns

Overview
********
Expand Down
9 changes: 7 additions & 2 deletions tests/tfm/tfm_regression_test/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
common:
tags: tfm
build_only: true
platform_allow: nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns nrf9151dk/nrf9151/ns
integration_platforms:
platform_allow:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
integration_platforms:
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9151dk/nrf9151/ns
- nrf9160dk/nrf9160/ns
- nrf9161dk/nrf9161/ns
harness: console
harness_config:
type: multi_line
Expand Down
Loading