Skip to content

Commit e77774f

Browse files
nordicjmcarlescufi
authored andcommitted
nrf_security: Remove redefined Kconfigs
Removes Kconfigs that are redefined because they are defined in an out of tree repo to prevent hiding problems if these symbols are renamed or removed Signed-off-by: Jamie McCrae <[email protected]>
1 parent 5561499 commit e77774f

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

subsys/nrf_security/Kconfig

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ if NRF_SECURITY
5959
config MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS
6060
bool
6161
default y if SOC_SERIES_NRF54LX && PSA_CRYPTO_DRIVER_CRACEN
62-
default y if SOC_SERIES_NRF54HX && SOC_NRF54H20_CPUSEC
62+
default y if PSA_WANT_PLATFORM_KEYS
6363
help
6464
Promptless option used to control if the PSA Crypto core should have support for builtin keys or not.
6565

@@ -254,8 +254,4 @@ config MBEDTLS_LIBRARY_NRF_SECURITY
254254

255255
endchoice
256256

257-
# This is for internal use only.
258-
config SOC_NRF54H20_CPUSEC
259-
bool
260-
261257
endmenu

subsys/nrf_security/src/drivers/Kconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ config PSA_CRYPTO_DRIVER_CRACEN
3636
help
3737
PSA crypto driver for the CRACEN HW peripheral.
3838

39+
config PSA_WANT_PLATFORM_KEYS
40+
bool
41+
help
42+
Hidden option if platform keys are supported.
43+
3944
menu "Choose DRBG algorithm"
4045
config PSA_WANT_ALG_CTR_DRBG
4146
prompt "Enable CTR_DRBG"

subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,7 +1857,6 @@ config PSA_NEED_CRACEN_PLATFORM_KEYS
18571857
default y
18581858
depends on PSA_WANT_ALG_GCM
18591859
depends on PSA_WANT_AES_KEY_SIZE_256
1860-
depends on SOC_NRF54H20_CPUSEC
1861-
1860+
depends on PSA_WANT_PLATFORM_KEYS
18621861

18631862
endmenu

0 commit comments

Comments
 (0)