Skip to content

Commit 9f0c017

Browse files
SebastianBoerlubos
authored andcommitted
[nrf fromtree] soc: nordic: uicr: Fix dependency issue
Although not reproducible locally, it has been observed in CI that the uicr image will not always be the last image to be run. To ensure it is the last image to be run we have it depend on the 'image' image when defined. The uicr image is generated based on all other images in the build and must therefore run last. Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit 32c6776)
1 parent d2b9e5f commit 9f0c017

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

soc/nordic/common/uicr/sysbuild.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@ ExternalZephyrProject_Add(
88

99
# Ensure UICR is configured and built after the default image so EDT/ELFs exist.
1010
sysbuild_add_dependencies(CONFIGURE uicr ${DEFAULT_IMAGE})
11+
1112
add_dependencies(uicr ${DEFAULT_IMAGE})
13+
if(DEFINED image)
14+
add_dependencies(uicr ${image})
15+
endif()

0 commit comments

Comments
 (0)