michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sysbuild: Remove IMAGES variable

Browse source 
This variable was originally provided for two indended purposes:

  * Let users manually add a new image in a desired order in the list.
  * Let users set build-only images, which are excluded from the list.

Given the recent additions of the `sysbuild_add_dependencies()` function
and the `BUILD_ONLY` parameter, `IMAGES` should be considered obsolete.

Furthermore, the list of images added to sysbuild should be updated
automatically when calling `ExternalZephyrProject_Add()`. This is now
possible by using a GLOBAL property internal to sysbuild.

With that, the `IMAGES` variable can be removed. Its existing usage for
image ordering is replaced with `sysbuild_add_dependencies()` treewide.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
This commit is contained in:
Grzegorz Swiderski 2023-05-15 11:19:47 +02:00 • committed by Carles Cufí
commit 6640c04df6
6 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/boot/test_mcuboot/sysbuild.cmake
View file

@ -15,11 +15,12 @@ ExternalZephyrProject_Add(
)
# Add the swapped app to the list of images to flash
# Ensure the order of images is as follows:
# Ensure the flashing order of images is as follows:
# - mcuboot
# - swapped app
# - primary app (test_mcuboot)
# This order means that if the debugger resets the MCU in between flash
# iterations, the MCUBoot swap won't be triggered until the secondary app
# is actually present in flash.
set(IMAGES "mcuboot" "swapped_app" "test_mcuboot")
sysbuild_add_dependencies(FLASH test_mcuboot swapped_app)
sysbuild_add_dependencies(FLASH swapped_app mcuboot)