[nrf noup] Fix KMU breaking non-KMU builds of MCUboot

The commit fixes problem where usage of OR instead of AND in conditional expression broke non-KMU signature builds of MCUboot. The commit also removes BOOT_SIGNATURE_TYPE_PURE_ALLOW on NRF_SECURITY, which breaks build for non-PSA builds. fixup! [nrf noup] bootutil: Add support for KMU stored ED25519 signature key Signed-off-by: Dominik Ermel <[email protected]>
nrfconnect · Oct 29, 2024 · 352a241 · 352a241
1 parent 0a70e49
commit 352a241
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt
@@ -313,7 +313,7 @@ if(CONFIG_MCUBOOT_SERIAL)
   endif()
 endif()
 
-if(NOT CONFIG_BOOT_SIGNATURE_USING_KMU OR NOT CONFIG_BOOT_SIGNATURE_KEY_FILE STREQUAL "")
+if(NOT CONFIG_BOOT_SIGNATURE_USING_KMU AND NOT CONFIG_BOOT_SIGNATURE_KEY_FILE STREQUAL "")
   # CONF_FILE points to the KConfig configuration files of the bootloader.
   foreach (filepath ${CONF_FILE})
     file(READ ${filepath} temp_text)

diff --git a/boot/zephyr/Kconfig b/boot/zephyr/Kconfig
@@ -194,7 +194,6 @@ 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