From 478babb544c16c5d5374d72cf71ca5d8789544b2 Mon Sep 17 00:00:00 2001 From: Aymen LAOUINI Date: Mon, 16 Dec 2024 14:59:24 +0200 Subject: [PATCH] subsys, nrf_security: add nrf92 devices to security and cracen config Ref: NRFX-6678 Signed-off-by: Aymen LAOUINI --- subsys/nrf_security/Kconfig | 3 ++- subsys/nrf_security/src/drivers/cracen/Kconfig | 5 +++-- subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/subsys/nrf_security/Kconfig b/subsys/nrf_security/Kconfig index 0064d04df591..acabeaa4ebaa 100644 --- a/subsys/nrf_security/Kconfig +++ b/subsys/nrf_security/Kconfig @@ -35,7 +35,7 @@ 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 - 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). @@ -58,6 +58,7 @@ if NRF_SECURITY config MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS bool + default y if SOC_SERIES_NRF92X && (SOC_NRF9280_CPUSEC || SOC_NRF9230_CPUSEC) default y if SOC_SERIES_NRF54LX && PSA_CRYPTO_DRIVER_CRACEN default y if SOC_SERIES_NRF54HX && SOC_NRF54H20_CPUSEC help diff --git a/subsys/nrf_security/src/drivers/cracen/Kconfig b/subsys/nrf_security/src/drivers/cracen/Kconfig index 8c323f0d9b05..360ebda03677 100644 --- a/subsys/nrf_security/src/drivers/cracen/Kconfig +++ b/subsys/nrf_security/src/drivers/cracen/Kconfig @@ -5,7 +5,7 @@ # config CRACEN_HW_PRESENT - def_bool SOC_SERIES_NRF54LX + def_bool (SOC_SERIES_NRF54LX || SOC_SERIES_NRF92X) # Configure CRACEN_LOG_LEVEL module = CRACEN @@ -16,7 +16,8 @@ if PSA_CRYPTO_DRIVER_CRACEN config CRACEN_LOAD_MICROCODE bool "Load CRACEN microcode" - depends on (SOC_SERIES_NRF54LX && !SOC_NRF54L20) || SOC_SERIES_NRF54HX + depends on (SOC_SERIES_NRF54LX && !SOC_NRF54L20) || SOC_SERIES_NRF54HX || \ + (SOC_SERIES_NRF92X && (SOC_NRF9280_CPUSEC || SOC_NRF9230_CPUSEC)) default y help Prompt-less configuration to load the CRACEN microcode. diff --git a/subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig b/subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig index bd989b5c4a7e..037a3c7d1ec0 100644 --- a/subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig +++ b/subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig @@ -1848,7 +1848,9 @@ config PSA_NEED_CRACEN_PLATFORM_KEYS default y depends on PSA_WANT_ALG_GCM depends on PSA_WANT_AES_KEY_SIZE_256 - depends on SOC_NRF54H20_CPUSEC + depends on SOC_NRF54H20_CPUSEC || \ + SOC_NRF9280_CPUSEC || \ + SOC_NRF9230_CPUSEC endmenu