samples: persistent_key_usage: use the ZMS settings backend on 54L15

tomi-font · rlubos · commit 7f3242fc51b4 · 2024-10-21T15:33:27.000+02:00
And fix the main configuration file by moving
`CONFIG_TFM_ITS_ENCRYPTED=y` to the TF-M board targets' ones.

Signed-off-by: Tomi Fontanilles &lt;tomi.fontanilles@nordicsemi.no&gt;
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
@@ -7,3 +7,5 @@ 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
@@ -7,15 +7,11 @@
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y
 
-# Use TRUSTED_STORAGE because this is a secure-only board
+# Use TRUSTED_STORAGE because this is a non-TF-M board target.
 CONFIG_TRUSTED_STORAGE=y
 
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-CONFIG_NVS=y
+CONFIG_ZMS=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
@@ -0,0 +1,4 @@
+# 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
@@ -7,15 +7,11 @@
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y
 
-# Use TRUSTED_STORAGE because this is a secure-only board
+# Use TRUSTED_STORAGE because this is a non-TF-M board target.
 CONFIG_TRUSTED_STORAGE=y
 
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-CONFIG_NVS=y
+CONFIG_ZMS=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
@@ -7,3 +7,5 @@ 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
@@ -7,3 +7,5 @@ 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
@@ -7,3 +7,5 @@ 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
@@ -27,5 +27,3 @@ 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
