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

nordic-piks · nordicjm · commit ba6cb380b66f · 2024-10-18T08:41:55.000+01:00
This reverts commit 6060806. Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
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,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
@@ -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
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,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
@@ -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
@@ -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
@@ -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
@@ -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
