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

[nrf toup] Implicitly enable PSA crypto driver for given platform #485

Merged
merged 1 commit into from
Oct 11, 2024
Merged
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
2 changes: 1 addition & 1 deletion config/nrfconnect/chip-module/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ config CHIP_MALLOC_SYS_HEAP

config CHIP_TASK_STACK_SIZE
int "The CHIP (Matter) thread stack size"
default 10240 if LTO
default 10240 if (LTO || PSA_CRYPTO_DRIVER_CC3XX)
default 6144
help
Configures the stack size available for the CHIP (Matter) thread.
Expand Down
24 changes: 15 additions & 9 deletions config/nrfconnect/chip-module/Kconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -300,15 +300,13 @@ choice RNG_GENERATOR_CHOICE
default XOSHIRO_RANDOM_GENERATOR if SOC_SERIES_NRF53X
endchoice

config OBERON_BACKEND
default y

config MBEDTLS_ENABLE_HEAP
default y
default y if !BUILD_WITH_TFM
default n

config MBEDTLS_HEAP_SIZE
default 8192

# Enable PSA Crypto dependencies for Matter

config CHIP_CRYPTO_PSA
Expand All @@ -317,9 +315,15 @@ config CHIP_CRYPTO_PSA

if CHIP_CRYPTO_PSA

config PSA_CRYPTO_DRIVER_OBERON
default y if (SOC_SERIES_NRF52X || SOC_SERIES_NRF53X)

config PSA_CRYPTO_DRIVER_CC3XX
default n

config PSA_CRYPTO_DRIVER_CRACEN
default y if SOC_SERIES_NRF54LX

config PSA_WANT_ALG_SHA_224
default n

Expand All @@ -335,14 +339,13 @@ config PSA_USE_CC3XX_HASH_DRIVER

endif # PSA_CRYPTO_DRIVER_CC3XX && PSA_CRYPTO_DRIVER_OBERON

# Spake2+ support
config MBEDTLS_MD_C
default y

endif # CHIP_CRYPTO_PSA

if !CHIP_CRYPTO_PSA

config OBERON_BACKEND
default y

config NRF_SECURITY_ADVANCED
default y

Expand All @@ -355,6 +358,9 @@ config MBEDTLS_CTR_DRBG_C
config MBEDTLS_CIPHER_MODE_CTR
default y

config MBEDTLS_MD_C
default y

config MBEDTLS_SHA1_C
default y if CHIP_WIFI

Expand Down
Loading