Skip to content

Commit

Permalink
zephyr: Fix issue with sysbuild if something else is named mcuboot
Browse files Browse the repository at this point in the history
Fixes an issue which can occur in tests whereby an application
has the name mcuboot but is not mcuboot itself

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
  • Loading branch information
nordicjm committed Jul 26, 2024
1 parent d5e0e89 commit 8456464
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions boot/zephyr/sysbuild/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ function(mathup num align result)
endfunction()

function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_image_cmake)
cmake_parse_arguments(POST_IMAGE_CMAKE "" "IMAGE" "IMAGES" ${ARGN})
cmake_parse_arguments(PRE_IMAGE_CMAKE "" "IMAGE" "IMAGES" ${ARGN})

if(NOT "${POST_IMAGE_CMAKE_IMAGE}" STREQUAL "mcuboot")
if(NOT "${PRE_IMAGE_CMAKE_IMAGE}" STREQUAL "mcuboot" OR NOT SB_CONFIG_BOOTLOADER_MCUBOOT)
return()
endif()

Expand All @@ -21,7 +21,7 @@ endfunction(${SYSBUILD_CURRENT_MODULE_NAME}_pre_image_cmake)
function(${SYSBUILD_CURRENT_MODULE_NAME}_post_image_cmake)
cmake_parse_arguments(POST_IMAGE_CMAKE "" "IMAGE" "IMAGES" ${ARGN})

if(NOT "${POST_IMAGE_CMAKE_IMAGE}" STREQUAL "mcuboot")
if(NOT "${POST_IMAGE_CMAKE_IMAGE}" STREQUAL "mcuboot" OR NOT SB_CONFIG_BOOTLOADER_MCUBOOT)
return()
endif()

Expand Down

0 comments on commit 8456464

Please sign in to comment.