Commit 10a877cb authored by Wouter Cappelle's avatar Wouter Cappelle Committed by Fabio Utzig
Browse files

zephyr: fix compilation when no CONFIG_BOOT_ENCRYPTION_KEY_FILE 



Fix compilation of zephyr builds when there is no
CONFIG_BOOT_ENCRYPTION_KEY_FILE set.
bug introduced by #1255

Signed-off-by: default avatarWouter Cappelle <wouter.cappelle@crodeon.com>
parent 42e679d6

boot/zephyr/CMakeLists.txt

+14 −15
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ if(NOT CONFIG_BOOT_SIGNATURE_KEY_FILE STREQUAL "") 
  zephyr_library_sources(${GENERATED_PUBKEY})

endif()



if(CONFIG_BOOT_ENCRYPTION_KEY_FILE AND NOT CONFIG_BOOT_ENCRYPTION_KEY_FILE STREQUAL "")

  # CONF_FILE points to the KConfig configuration files of the bootloader.

  unset(CONF_DIR)

  foreach(filepath ${CONF_FILE})
@@ -319,8 +320,6 @@ foreach(filepath ${CONF_FILE}) 
    endif()

  endforeach()





if(NOT CONFIG_BOOT_ENCRYPTION_KEY_FILE STREQUAL "")

  if(IS_ABSOLUTE ${CONFIG_BOOT_ENCRYPTION_KEY_FILE})

    set(KEY_FILE ${CONFIG_BOOT_ENCRYPTION_KEY_FILE})

  elseif((DEFINED CONF_DIR) AND
@@ -329,7 +328,7 @@ if(NOT CONFIG_BOOT_ENCRYPTION_KEY_FILE STREQUAL "") 
  else()

    set(KEY_FILE ${MCUBOOT_DIR}/${CONFIG_BOOT_ENCRYPTION_KEY_FILE})

  endif()

  message("MCUBoot bootloader key file: ${KEY_FILE}")

  message("MCUBoot bootloader encryption key file: ${KEY_FILE}")



  set(GENERATED_ENCKEY ${ZEPHYR_BINARY_DIR}/autogen-enckey.c)

  add_custom_command(

CRA Git | Maintained and supported by SUSTech CRA and CCSE