Skip to content

Commit

Permalink
fixup: Fix Kconfigs
Browse files Browse the repository at this point in the history
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
  • Loading branch information
nordicjm committed Oct 23, 2024
1 parent 2ae9544 commit d2b7993
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions boot/zephyr/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ endchoice # BOOT_IMG_HASH_ALG

config BOOT_SIGNATURE_TYPE_PURE_ALLOW
bool
depends on NRF_SECURITY
help
Hidden option set by configurations that allow Pure variant,
for example ed25519. The pure variant means that image
Expand Down Expand Up @@ -293,6 +294,7 @@ config BOOT_ED25519_MBEDTLS

config BOOT_ED25519_PSA
bool "Use PSA crypto"
depends on NRF_SECURITY
select BOOT_USE_PSA_CRYPTO
select BOOT_ED25519_PSA_DEPENDENCIES
select BOOT_X25519_PSA_DEPENDENCIES if BOOT_ENCRYPT_IMAGE
Expand All @@ -304,15 +306,17 @@ endchoice

config BOOT_SIGNATURE_USING_KMU
bool "Use KMU stored keys for signature verification"
help
The MCUboot will use keys provisioned to board for signature verification
instead of compiling in a key data.
depends on NRF_SECURITY
depends on CRACEN_LIB_KMU
select PSA_WANT_ALG_GCM
select PSA_WANT_KEY_TYPE_AES
select PSA_WANT_AES_KEY_SIZE_256
select PSA_WANT_ALG_SP800_108_COUNTER_CMAC
select PSA_WANT_ALG_CMAC
select PSA_WANT_ALG_ECB_NO_PADDING
help
MCUboot will use keys provisioned to the device key management unit for signature
verification instead of compiling in key data from a file.

if !BOOT_SIGNATURE_USING_KMU

Expand Down Expand Up @@ -351,10 +355,18 @@ config MCUBOOT_CLEANUP_ARM_CORE
start-up code which can cause a module fault and potentially make the
module irrecoverable.

# Disable MBEDTLS from being selected if NRF_SECURITY is enabled, and use default NRF_SECURITY
# configuration file for MBEDTLS
config MBEDTLS
depends on !NRF_SECURITY

config NRF_SECURITY
select MBEDTLS_PROMPTLESS

if MBEDTLS

config MBEDTLS_CFG_FILE
default "mcuboot-mbedtls-cfg.h"
default "mcuboot-mbedtls-cfg.h" if !NRF_SECURITY

endif

Expand Down

0 comments on commit d2b7993

Please sign in to comment.