Commit 88f30f3f authored by Jamie McCrae's avatar Jamie McCrae Committed by Anas Nashif
Browse files

samples: Use DEFAULT_IMAGE for sysbuild 

Uses the variable for the default image when adding sysbuild
dependencies so that they can be copied out-of-tree and still work

Signed-off-by: default avatarJamie McCrae <jamie.mccrae@nordicsemi.no>
parent 116fdc1a

samples/drivers/ipm/ipm_mcux/sysbuild.cmake

+2 −2
Changes for samples/drivers/ipm/ipm_mcux/sysbuild.cmake: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ ExternalZephyrProject_Add( 
# Add dependencies so that the remote sample will be built first

# This is required because some primary cores need information from the

# remote core's build, such as the output image's LMA

add_dependencies(ipm_mcux ipm_mcux_remote)

sysbuild_add_dependencies(CONFIGURE ipm_mcux ipm_mcux_remote)

add_dependencies(${DEFAULT_IMAGE} ipm_mcux_remote)

sysbuild_add_dependencies(CONFIGURE ${DEFAULT_IMAGE} ipm_mcux_remote)



if(SB_CONFIG_BOOTLOADER_MCUBOOT)

  # Make sure MCUboot is flashed first

samples/subsys/ipc/openamp/sysbuild.cmake

+2 −2
Changes for samples/subsys/ipc/openamp/sysbuild.cmake: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ ExternalZephyrProject_Add( 
# Add dependencies so that the remote sample will be built first

# This is required because some primary cores need information from the

# remote core's build, such as the output image's LMA

add_dependencies(openamp openamp_remote)

sysbuild_add_dependencies(CONFIGURE openamp openamp_remote)

add_dependencies(${DEFAULT_IMAGE} openamp_remote)

sysbuild_add_dependencies(CONFIGURE ${DEFAULT_IMAGE} openamp_remote)



if(SB_CONFIG_BOOTLOADER_MCUBOOT)

  # Make sure MCUboot is flashed first

samples/subsys/ipc/rpmsg_service/sysbuild.cmake

+1 −1
Changes for samples/subsys/ipc/rpmsg_service/sysbuild.cmake: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ ExternalZephyrProject_Add( 
    BOARD ${SB_CONFIG_RPMSG_REMOTE_BOARD}

  )



add_dependencies(rpmsg_service rpmsg_service_remote)
 
add_dependencies(${DEFAULT_IMAGE} rpmsg_service_remote)

samples/sysbuild/hello_world/sysbuild.cmake

+2 −2
Changes for samples/sysbuild/hello_world/sysbuild.cmake: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -11,5 +11,5 @@ ExternalZephyrProject_Add( 
  BOARD ${SB_CONFIG_REMOTE_BOARD}

)



add_dependencies(hello_world remote)

sysbuild_add_dependencies(FLASH hello_world remote)
 
add_dependencies(${DEFAULT_IMAGE} remote)

sysbuild_add_dependencies(FLASH ${DEFAULT_IMAGE} remote)

CRA Git | Maintained and supported by SUSTech CRA and CCSE