From d91e9f1c17a84a4f2837f0d217867dca74a2c417 Mon Sep 17 00:00:00 2001 From: Piotr Kosycarz Date: Fri, 18 Oct 2024 08:18:20 +0200 Subject: [PATCH 1/2] Revert "trusted_storage: disallow NVS on nRF54L15" This reverts commit b933de4b9ad42477f43b985d17e498cd84e496cf. Signed-off-by: Piotr Kosycarz --- subsys/trusted_storage/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subsys/trusted_storage/Kconfig b/subsys/trusted_storage/Kconfig index 2c73931b4fde..27ead4ff62a9 100644 --- a/subsys/trusted_storage/Kconfig +++ b/subsys/trusted_storage/Kconfig @@ -158,7 +158,7 @@ choice TRUSTED_STORAGE_STORAGE_BACKEND config TRUSTED_STORAGE_STORAGE_BACKEND_SETTINGS bool "Settings storage backend" - depends on SETTINGS_ZMS || (SETTINGS_NVS && !SOC_NRF54L15) + depends on SETTINGS_NVS || SETTINGS_ZMS help Use the Settings subsystem to store the assets From 7994f85892bec6214a1adba800a649e87835b22e Mon Sep 17 00:00:00 2001 From: Piotr Kosycarz Date: Fri, 18 Oct 2024 08:18:33 +0200 Subject: [PATCH 2/2] Revert "samples: persistent_key_usage: use the ZMS settings backend on 54L15" This reverts commit 60608063e051220b8c300d145edcd7903f10b62e. Signed-off-by: Piotr Kosycarz --- .../boards/nrf5340dk_nrf5340_cpuapp_ns.conf | 2 -- .../boards/nrf54l15dk_nrf54l15_cpuapp.conf | 8 ++++++-- .../boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 4 ---- .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 8 ++++++-- .../persistent_key_usage/boards/nrf9151dk_nrf9151_ns.conf | 2 -- .../persistent_key_usage/boards/nrf9160dk_nrf9160_ns.conf | 2 -- .../persistent_key_usage/boards/nrf9161dk_nrf9161_ns.conf | 2 -- samples/crypto/persistent_key_usage/prj.conf | 2 ++ 8 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 samples/crypto/persistent_key_usage/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf diff --git a/samples/crypto/persistent_key_usage/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/samples/crypto/persistent_key_usage/boards/nrf5340dk_nrf5340_cpuapp_ns.conf index 8348b6d959dd..0b6c20e1aa11 100644 --- a/samples/crypto/persistent_key_usage/boards/nrf5340dk_nrf5340_cpuapp_ns.conf +++ b/samples/crypto/persistent_key_usage/boards/nrf5340dk_nrf5340_cpuapp_ns.conf @@ -7,5 +7,3 @@ CONFIG_TFM_PROFILE_TYPE_NOT_SET=y # Using hardware crypto accelerator CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y - -CONFIG_TFM_ITS_ENCRYPTED=y diff --git a/samples/crypto/persistent_key_usage/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/crypto/persistent_key_usage/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 976a5a88ec79..457d9d818da3 100644 --- a/samples/crypto/persistent_key_usage/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/crypto/persistent_key_usage/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,11 +7,15 @@ CONFIG_PSA_CRYPTO_DRIVER_OBERON=n CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y -# Use TRUSTED_STORAGE because this is a non-TF-M board target. +# Use TRUSTED_STORAGE because this is a secure-only board CONFIG_TRUSTED_STORAGE=y CONFIG_FLASH=y CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y -CONFIG_ZMS=y +CONFIG_NVS=y CONFIG_SETTINGS=y +CONFIG_SETTINGS_NVS=y + +# Comment out for more detailed NVS logging +CONFIG_NVS_LOG_LEVEL_ERR=y diff --git a/samples/crypto/persistent_key_usage/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/crypto/persistent_key_usage/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf deleted file mode 100644 index b0a4a3dbc487..000000000000 --- a/samples/crypto/persistent_key_usage/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -CONFIG_TFM_ITS_ENCRYPTED=y diff --git a/samples/crypto/persistent_key_usage/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/crypto/persistent_key_usage/boards/nrf54l15pdk_nrf54l15_cpuapp.conf index 976a5a88ec79..457d9d818da3 100644 --- a/samples/crypto/persistent_key_usage/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ b/samples/crypto/persistent_key_usage/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -7,11 +7,15 @@ CONFIG_PSA_CRYPTO_DRIVER_OBERON=n CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y -# Use TRUSTED_STORAGE because this is a non-TF-M board target. +# Use TRUSTED_STORAGE because this is a secure-only board CONFIG_TRUSTED_STORAGE=y CONFIG_FLASH=y CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y -CONFIG_ZMS=y +CONFIG_NVS=y CONFIG_SETTINGS=y +CONFIG_SETTINGS_NVS=y + +# Comment out for more detailed NVS logging +CONFIG_NVS_LOG_LEVEL_ERR=y diff --git a/samples/crypto/persistent_key_usage/boards/nrf9151dk_nrf9151_ns.conf b/samples/crypto/persistent_key_usage/boards/nrf9151dk_nrf9151_ns.conf index 8348b6d959dd..0b6c20e1aa11 100644 --- a/samples/crypto/persistent_key_usage/boards/nrf9151dk_nrf9151_ns.conf +++ b/samples/crypto/persistent_key_usage/boards/nrf9151dk_nrf9151_ns.conf @@ -7,5 +7,3 @@ CONFIG_TFM_PROFILE_TYPE_NOT_SET=y # Using hardware crypto accelerator CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y - -CONFIG_TFM_ITS_ENCRYPTED=y diff --git a/samples/crypto/persistent_key_usage/boards/nrf9160dk_nrf9160_ns.conf b/samples/crypto/persistent_key_usage/boards/nrf9160dk_nrf9160_ns.conf index 8348b6d959dd..0b6c20e1aa11 100644 --- a/samples/crypto/persistent_key_usage/boards/nrf9160dk_nrf9160_ns.conf +++ b/samples/crypto/persistent_key_usage/boards/nrf9160dk_nrf9160_ns.conf @@ -7,5 +7,3 @@ CONFIG_TFM_PROFILE_TYPE_NOT_SET=y # Using hardware crypto accelerator CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y - -CONFIG_TFM_ITS_ENCRYPTED=y diff --git a/samples/crypto/persistent_key_usage/boards/nrf9161dk_nrf9161_ns.conf b/samples/crypto/persistent_key_usage/boards/nrf9161dk_nrf9161_ns.conf index 8348b6d959dd..0b6c20e1aa11 100644 --- a/samples/crypto/persistent_key_usage/boards/nrf9161dk_nrf9161_ns.conf +++ b/samples/crypto/persistent_key_usage/boards/nrf9161dk_nrf9161_ns.conf @@ -7,5 +7,3 @@ CONFIG_TFM_PROFILE_TYPE_NOT_SET=y # Using hardware crypto accelerator CONFIG_PSA_CRYPTO_DRIVER_CC3XX=y - -CONFIG_TFM_ITS_ENCRYPTED=y diff --git a/samples/crypto/persistent_key_usage/prj.conf b/samples/crypto/persistent_key_usage/prj.conf index f2a0b759f34e..cb62746f887b 100644 --- a/samples/crypto/persistent_key_usage/prj.conf +++ b/samples/crypto/persistent_key_usage/prj.conf @@ -27,3 +27,5 @@ CONFIG_MBEDTLS_HEAP_SIZE=8192 CONFIG_PSA_WANT_KEY_TYPE_AES=y CONFIG_PSA_WANT_ALG_CTR=y CONFIG_PSA_WANT_GENERATE_RANDOM=y + +CONFIG_TFM_ITS_ENCRYPTED=y