Skip to content

Commit 8ca85dd

Browse files
nordicjmeivindj-nordic
authored andcommitted
sysbuild: Prevent build warning and access storage directly
Prevent a build warning when using KMU and accesses storage directly, as only internal NVM is used Signed-off-by: Jamie McCrae <[email protected]>
1 parent d62d6b0 commit 8ca85dd

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

sysbuild/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,17 @@ function(bm_install_setup)
4444
set_config_bool(${SB_CONFIG_BM_FIRMWARE_LOADER_IMAGE_NAME} CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512 y)
4545
elseif(SB_CONFIG_BM_BOOT_IMG_HASH_ALG_PURE)
4646
set_config_bool(mcuboot CONFIG_BOOT_SIGNATURE_TYPE_PURE y)
47-
set_config_bool(mcuboot CONFIG_BOOT_IMG_HASH_ALG_SHA512 y)
4847
set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_PURE y)
4948
set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512 y)
5049
set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_ED25519 y)
5150
set_config_bool(${SB_CONFIG_BM_FIRMWARE_LOADER_IMAGE_NAME} CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_PURE y)
5251
set_config_bool(${SB_CONFIG_BM_FIRMWARE_LOADER_IMAGE_NAME} CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512 y)
5352
set_config_bool(${SB_CONFIG_BM_FIRMWARE_LOADER_IMAGE_NAME} CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_ED25519 y)
53+
54+
# Not needed when using KMU as PSA core lite is used
55+
if(NOT SB_CONFIG_BM_BOOTLOADER_MCUBOOT_SIGNATURE_USING_KMU)
56+
set_config_bool(mcuboot CONFIG_BOOT_IMG_HASH_ALG_SHA512 y)
57+
endif()
5458
endif()
5559

5660
if(SB_CONFIG_SOC_SERIES_NRF54LX)
@@ -68,6 +72,7 @@ function(bm_install_setup)
6872
set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER n)
6973
set_config_bool(mcuboot CONFIG_BOOT_HMAC_SHA512 n)
7074
set_config_bool(mcuboot CONFIG_BOOT_KEY_IMPORT_BYPASS_ASN y)
75+
set_config_bool(mcuboot CONFIG_BOOT_IMG_HASH_DIRECTLY_ON_STORAGE y)
7176

7277
if(SB_CONFIG_BM_BOOTLOADER_MCUBOOT_SIGNATURE_USING_KMU)
7378
set_config_bool(mcuboot CONFIG_BOOT_SIGNATURE_USING_KMU y)

0 commit comments

Comments
 (0)