@@ -231,40 +231,45 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
231231 endforeach ()
232232
233233 # The NRF54LX goes with PSA crypto by default
234- if (SB_CONFIG_SOC_SERIES_NRF54LX AND SB_CONFIG_BOOT_SIGNATURE_TYPE_ED25519)
235- set_config_bool(mcuboot CONFIG_NRF_SECURITY y)
236- set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_ED25519 y)
237- set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512 y)
238-
239- # We are sure that ED25519 signature on MCUboot does not need these
240- set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_CIPHER_DRIVER n)
241- set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_AEAD_DRIVER n)
242- set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_MAC_DRIVER n)
243- set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER n)
244- set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_PAKE_DRIVER n)
245- set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER n)
246-
247- if (SB_CONFIG_MCUBOOT_SIGNATURE_USING_KMU)
248- set_config_bool(mcuboot CONFIG_BOOT_SIGNATURE_USING_KMU y)
249- else ()
250- set_config_bool(mcuboot CONFIG_BOOT_SIGNATURE_USING_KMU n)
251- endif ()
234+ if (SB_CONFIG_SOC_SERIES_NRF54LX)
235+ if (SB_CONFIG_BOOT_SIGNATURE_TYPE_ED25519)
236+ set_config_bool(mcuboot CONFIG_NRF_SECURITY y)
237+ set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_ED25519 y)
238+ set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512 y)
239+
240+ # We are sure that ED25519 signature on MCUboot does not need these
241+ set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_CIPHER_DRIVER n)
242+ set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_AEAD_DRIVER n)
243+ set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_MAC_DRIVER n)
244+ set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER n)
245+ set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_PAKE_DRIVER n)
246+ set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER n)
247+
248+ if (SB_CONFIG_MCUBOOT_SIGNATURE_USING_KMU)
249+ set_config_bool(mcuboot CONFIG_BOOT_SIGNATURE_USING_KMU y)
250+ else ()
251+ set_config_bool(mcuboot CONFIG_BOOT_SIGNATURE_USING_KMU n)
252+ endif ()
252253
253- if (SB_CONFIG_BOOT_SIGNATURE_TYPE_PURE)
254- set_config_bool(mcuboot CONFIG_BOOT_SIGNATURE_TYPE_PURE y)
255- set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_PURE y)
256- else ()
257- set_config_bool(mcuboot CONFIG_BOOT_SIGNATURE_TYPE_PURE n)
258- set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_PURE n)
259- endif ()
254+ if (SB_CONFIG_BOOT_SIGNATURE_TYPE_PURE)
255+ set_config_bool(mcuboot CONFIG_BOOT_SIGNATURE_TYPE_PURE y)
256+ set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_PURE y)
257+ else ()
258+ set_config_bool(mcuboot CONFIG_BOOT_SIGNATURE_TYPE_PURE n)
259+ set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_PURE n)
260+ endif ()
260261
261- # MCUboot uses hash function to identify key internally when KMU is disabled.
262- if (SB_CONFIG_MCUBOOT_SIGNATURE_USING_KMU AND SB_CONFIG_BOOT_SIGNATURE_TYPE_PURE)
263- set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_HASH_DRIVER n)
264- set_config_bool(mcuboot CONFIG_BOOT_IMG_HASH_ALG_SHA512 n)
262+ # MCUboot uses hash function to identify key internally when KMU is disabled.
263+ if (SB_CONFIG_MCUBOOT_SIGNATURE_USING_KMU AND SB_CONFIG_BOOT_SIGNATURE_TYPE_PURE)
264+ set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_HASH_DRIVER n)
265+ set_config_bool(mcuboot CONFIG_BOOT_IMG_HASH_ALG_SHA512 n)
266+ else ()
267+ set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_HASH_DRIVER y)
268+ set_config_bool(mcuboot CONFIG_BOOT_IMG_HASH_ALG_SHA512 y)
269+ endif ()
265270 else ()
266- set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_HASH_DRIVER y )
267- set_config_bool(mcuboot CONFIG_BOOT_IMG_HASH_ALG_SHA512 y )
271+ set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_ED25519 n )
272+ set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512 n )
268273 endif ()
269274 endif ()
270275
0 commit comments