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.

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

subsys nrf_security: add nrf92 devices to security and cracen config #19558

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
3 changes: 2 additions & 1 deletion subsys/nrf_security/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ config NRF_SECURITY
depends on SOC_FAMILY_NORDIC_NRF
default y if BUILD_WITH_TFM
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git commit title should have : not ,

# entropy is provided by PSA and NRF_SECURITY on NRF54LX
default y if ENTROPY_PSA_CRYPTO_RNG && SOC_SERIES_NRF54LX
default y if ENTROPY_PSA_CRYPTO_RNG && (SOC_SERIES_NRF54LX || SOC_SERIES_NRF92X)
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 @@ -58,6 +58,7 @@ if NRF_SECURITY

config MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS
bool
default y if SOC_SERIES_NRF92X
default y if SOC_SERIES_NRF54LX && PSA_CRYPTO_DRIVER_CRACEN
default y if PSA_WANT_PLATFORM_KEYS
help
Expand Down
3 changes: 2 additions & 1 deletion subsys/nrf_security/src/drivers/cracen/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ if PSA_CRYPTO_DRIVER_CRACEN

config SUPPORTS_CRACEN
bool
default y if (SOC_SERIES_NRF54LX && !SOC_NRF54L20) || SOC_SERIES_NRF54HX
default y if (SOC_SERIES_NRF54LX && !SOC_NRF54L20) || SOC_SERIES_NRF54HX || \
SOC_SERIES_NRF92X

config CRACEN_LOAD_MICROCODE
bool "Load CRACEN microcode"
Expand Down
2 changes: 1 addition & 1 deletion subsys/sdfw_services/services/psa_crypto/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#

service_name = PSA_CRYPTO
service_default_enabled = n
service_default_enabled = y
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change required?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be removed as it is not part of this PR changes, I will add it to this one #19561 as it relies on PSA_CRYPTO services to perform the signing of Json Web Tokens.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonathannilsen is it possible to activate this flag for an sdk-nrf sample using the prj.conf file ?
you are right about activating this by default actually doesn't make sense.

service_id = 0x71
service_version = 2
service_buffer_size = 128
Expand Down