OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

zephyr: Fix issue with sysbuild if something else is named mcuboot 

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>
This commit is contained in:
Jamie McCrae 2024-07-25 14:11:28 +01:00 committed by Jamie
parent d5e0e89568
commit 8456464c04
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot/zephyr/sysbuild/CMakeLists.txt
View File

@ -4,9 +4,9 @@ function(mathup num align result)
endfunction() endfunction()
function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_image_cmake) 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() return()
endif() endif()
@ -21,7 +21,7 @@ endfunction(${SYSBUILD_CURRENT_MODULE_NAME}_pre_image_cmake)
function(${SYSBUILD_CURRENT_MODULE_NAME}_post_image_cmake) function(${SYSBUILD_CURRENT_MODULE_NAME}_post_image_cmake)
cmake_parse_arguments(POST_IMAGE_CMAKE "" "IMAGE" "IMAGES" ${ARGN}) 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() return()
endif() endif()