Skip to content

FOR CI ONLY - DONT REVIEW #24932

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

FOR CI ONLY - DONT REVIEW #24932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
935df8f
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Oct 1, 2025
0535853
nrf_security: Force disabling the PSA core with Ironside
Vge0rge Oct 1, 2025
30800f4
nrf_security: Enable NRF_SECURITY for Ironside devices
Vge0rge Oct 1, 2025
9ad4657
trusted_storage: Forbid usage with NRF_IRONSIDE
Vge0rge Oct 2, 2025
1d8d7ff
nrf_security: Enable PSA_CRYPTO for NRF_SECURITY
Vge0rge Oct 8, 2025
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
6 changes: 4 additions & 2 deletions subsys/nrf_security/Kconfig
View file
Open in desktop
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 All @@ -45,6 +46,7 @@ config NRF_SECURITY
# CONFIG_TFM_BL2.
select TFM_BL2_NOT_SUPPORTED if BUILD_WITH_TFM
select PSA_CRYPTO_CLIENT
select PSA_CRYPTO
help
Set this configuration to enable nRF Security. This provides
Arm PSA cryptography APIs with RNG support (optionally).
Expand Down
7 changes: 7 additions & 0 deletions subsys/nrf_security/src/core/Kconfig
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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: d47f109210e74e2e9df3ab5485a32b8a34254caf
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