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

Revert zms nrf54l15 #17992

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Revert zms nrf54l15 #17992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d91e9f1
Revert "trusted_storage: disallow NVS on nRF54L15"
nordic-piks Oct 18, 2024
7994f85
Revert "samples: persistent_key_usage: use the ZMS settings backend o…
nordic-piks Oct 18, 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
2 changes: 0 additions & 2 deletions samples/crypto/persistent_key_usage/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 6 additions & 2 deletions samples/crypto/persistent_key_usage/boards/nrf54l15dk_nrf54l15_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions samples/crypto/persistent_key_usage/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions samples/crypto/persistent_key_usage/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions samples/crypto/persistent_key_usage/boards/nrf9151dk_nrf9151_ns.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions samples/crypto/persistent_key_usage/boards/nrf9160dk_nrf9160_ns.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions samples/crypto/persistent_key_usage/boards/nrf9161dk_nrf9161_ns.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions samples/crypto/persistent_key_usage/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion subsys/trusted_storage/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading