From 6d3f9f4257a34b9d6993ea267c256f8b24be8f9d Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Wed, 12 Feb 2025 16:03:37 +0100 Subject: [PATCH] sysbuild: Specify BOARD if the main image sets it It is necessary to configure the BOARD variable as fast as possible, since there are scritps (i.e. UICR generation) that uses this value and fail otherwise. Ref: NCSDK-3012 Signed-off-by: Tomasz Chyrowicz --- .../modules/ncs_sysbuild_extensions.cmake | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake b/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake index 795b66c836ed..4e3683fb36a1 100644 --- a/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake +++ b/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake @@ -22,11 +22,21 @@ function(ExternalNcsVariantProject_Add) ExternalProject_Get_Property(${VBUILD_APPLICATION} SOURCE_DIR BINARY_DIR) set(${VBUILD_APPLICATION}_BINARY_DIR ${BINARY_DIR}) - ExternalZephyrProject_Add( - APPLICATION ${VBUILD_VARIANT} - SOURCE_DIR ${SOURCE_DIR} - BUILD_ONLY true + get_property(VARIANT_BOARD TARGET ${VBUILD_APPLICATION} PROPERTY BOARD) + if(DEFINED VARIANT_BOARD) + ExternalZephyrProject_Add( + APPLICATION ${VBUILD_VARIANT} + SOURCE_DIR ${SOURCE_DIR} + BOARD ${VARIANT_BOARD} + BUILD_ONLY true ) + else() + ExternalZephyrProject_Add( + APPLICATION ${VBUILD_VARIANT} + SOURCE_DIR ${SOURCE_DIR} + BUILD_ONLY true + ) + endif() set_property(TARGET ${VBUILD_VARIANT} PROPERTY NCS_VARIANT_APPLICATION ${VBUILD_APPLICATION}) set_property(TARGET ${VBUILD_VARIANT} APPEND PROPERTY _EP_CMAKE_ARGS