Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 subsys/nrf_security/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ config NRF_SECURITY
depends on SOC_FAMILY_NORDIC_NRF
default y if BUILD_WITH_TFM
# entropy is provided by PSA and NRF_SECURITY on NRF54LX and NRF71X
default y if DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED && SOC_SERIES_NRF54LX && !IS_BOOTLOADER_IMG && GEN_ISR_TABLES
default y if DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED && SOC_SERIES_NRF71X && !IS_BOOTLOADER_IMG && GEN_ISR_TABLES
default y if DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED \
&& (SOC_SERIES_NRF54LX || SOC_SERIES_NRF71X || DT_HAS_NORDIC_IRONSIDE_CALL_ENABLED) \
&& !IS_BOOTLOADER_IMG && GEN_ISR_TABLES
select DISABLE_MBEDTLS_BUILTIN if MBEDTLS
# NCS does not use TF-M's BL2 bootloader, but uses it's own fork
# of MCUBoot instead (CONFIG_BOOTLOADER_MCUBOOT).
Expand Down
7 changes: 7 additions & 0 deletions subsys/nrf_security/src/core/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,23 @@
choice PSA_CORE
prompt "PSA Core implementation"

config PSA_CORE_DISABLED
bool
prompt "PSA core-less for SSF crypto client support"
depends on DT_HAS_NORDIC_IRONSIDE_CALL_ENABLED

config PSA_CORE_OBERON
bool
prompt "PSA Core implementation - Oberon"
select PSA_WANT_AES_KEY_SIZE_128
select PSA_WANT_AES_KEY_SIZE_192
select PSA_WANT_AES_KEY_SIZE_256
depends on !DT_HAS_NORDIC_IRONSIDE_CALL_ENABLED

config PSA_CORE_LITE
bool "PSA core created for tiny footprint"
depends on SOC_SERIES_NRF54LX
depends on !DT_HAS_NORDIC_IRONSIDE_CALL_ENABLED
help
The PSA core with tiny footprint is created to be used e.g. for bootloader
or similar use cases where there are severe size restrictions. This PSA core
Expand Down
1 change: 1 addition & 0 deletions subsys/trusted_storage/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
menuconfig TRUSTED_STORAGE
bool "Trusted Storage"
depends on !BUILD_WITH_TFM
depends on !NRF_IRONSIDE
help
The secure storage subsystem allows its users to store data in a
secure way, ensuring data integrity and confidentiality by using AEAD
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 69ad0523f95f13d1de356c19575301ce3de4959e
revision: pull/3346/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading