applications/samples/tests/sysbuild: Fix board revision usage

Fixes uses of sysbuild projects being added which did not use the BOARD_REVISION option properly Signed-off-by: Jamie McCrae <[email protected]>
Sriant · Jul 10, 2024 · 44c65d2 · 44c65d2
1 parent 41f88be
commit 44c65d2
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 17 deletions.
diff --git a/applications/machine_learning/sysbuild.cmake b/applications/machine_learning/sysbuild.cmake
@@ -17,6 +17,7 @@ if(SB_CONFIG_ML_APP_INCLUDE_REMOTE_IMAGE AND DEFINED SB_CONFIG_ML_APP_REMOTE_BOA
     APPLICATION remote
     SOURCE_DIR ${APP_DIR}/remote
     BOARD ${SB_CONFIG_ML_APP_REMOTE_BOARD}
+    BOARD_REVISION ${BOARD_REVISION}
   )
 
 if(SB_CONFIG_PARTITION_MANAGER)

diff --git a/samples/caf_sensor_manager/sysbuild.cmake b/samples/caf_sensor_manager/sysbuild.cmake
@@ -22,6 +22,7 @@ ExternalZephyrProject_Add(
   APPLICATION remote
   SOURCE_DIR ${APP_DIR}/remote
   BOARD ${SB_CONFIG_REMOTE_BOARD}
+  BOARD_REVISION ${BOARD_REVISION}
 )
 
 if(SB_CONFIG_PARTITION_MANAGER)

diff --git a/samples/event_manager_proxy/sysbuild.cmake b/samples/event_manager_proxy/sysbuild.cmake
@@ -16,6 +16,7 @@ ExternalZephyrProject_Add(
   APPLICATION remote
   SOURCE_DIR ${APP_DIR}/remote
   BOARD ${SB_CONFIG_REMOTE_BOARD}
+  BOARD_REVISION ${BOARD_REVISION}
 )
 set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
 set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)

diff --git a/samples/ipc/ipc_service/sysbuild.cmake b/samples/ipc/ipc_service/sysbuild.cmake
@@ -13,6 +13,7 @@ ExternalZephyrProject_Add(
   APPLICATION remote
   SOURCE_DIR ${APP_DIR}/remote
   BOARD ${SB_CONFIG_REMOTE_BOARD}
+  BOARD_REVISION ${BOARD_REVISION}
 )
 set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
 set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)

diff --git a/sysbuild/netcore.cmake b/sysbuild/netcore.cmake
@@ -11,20 +11,15 @@ if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE AND DEFINED SB_CONFI
   string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}")
   list(GET split_board_qualifiers 1 target_soc)
   list(GET split_board_qualifiers 2 target_cpucluster)
-
-  if(DEFINED BOARD_REVISION)
-    set(board_target_netcore "${BOARD}@${BOARD_REVISION}/${target_soc}/${SB_CONFIG_NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER}")
-  else()
-    set(board_target_netcore "${BOARD}/${target_soc}/${SB_CONFIG_NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER}")
-  endif()
-
+  set(board_target_netcore "${BOARD}/${target_soc}/${SB_CONFIG_NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER}")
   set(target_soc)
   set(target_cpucluster)
 
   ExternalZephyrProject_Add(
     APPLICATION ${SB_CONFIG_NETCORE_IMAGE_NAME}
     SOURCE_DIR ${SB_CONFIG_NETCORE_IMAGE_PATH}
     BOARD ${board_target_netcore}
+    BOARD_REVISION ${BOARD_REVISION}
   )
 
   if(NOT "${SB_CONFIG_NETCORE_IMAGE_DOMAIN}" IN_LIST PM_DOMAINS)

diff --git a/sysbuild/secureboot.cmake b/sysbuild/secureboot.cmake
@@ -11,11 +11,7 @@ if(SB_CONFIG_SECURE_BOOT)
     list(GET split_board_qualifiers 1 target_soc)
     list(GET split_board_qualifiers 2 target_cpucluster)
 
-    if(DEFINED BOARD_REVISION)
-      set(board_target_netcore "${BOARD}@${BOARD_REVISION}/${target_soc}/${SB_CONFIG_SECURE_BOOT_NETWORK_BOARD_TARGET_CPUCLUSTER}")
-    else()
-      set(board_target_netcore "${BOARD}/${target_soc}/${SB_CONFIG_SECURE_BOOT_NETWORK_BOARD_TARGET_CPUCLUSTER}")
-    endif()
+    set(board_target_netcore "${BOARD}/${target_soc}/${SB_CONFIG_SECURE_BOOT_NETWORK_BOARD_TARGET_CPUCLUSTER}")
 
     set(target_soc)
     set(target_cpucluster)
@@ -26,6 +22,7 @@ if(SB_CONFIG_SECURE_BOOT)
       APPLICATION b0n
       SOURCE_DIR ${secure_boot_source_dir}
       BOARD ${board_target_netcore}
+      BOARD_REVISION ${BOARD_REVISION}
       BUILD_ONLY true
     )
     set_target_properties(b0n PROPERTIES

diff --git a/sysbuild/suit.cmake b/sysbuild/suit.cmake
@@ -10,15 +10,12 @@ if(SB_CONFIG_SUIT_BUILD_FLASH_COMPANION)
   list(GET split_board_qualifiers 1 target_soc)
   list(GET split_board_qualifiers 2 target_cpucluster)
 
-  if(DEFINED BOARD_REVISION)
-    set(board_target "${BOARD}@${BOARD_REVISION}/${target_soc}/${SB_CONFIG_FLASH_COMPANION_TARGET_CPUCLUSTER}")
-  else()
-    set(board_target "${BOARD}/${target_soc}/${SB_CONFIG_FLASH_COMPANION_TARGET_CPUCLUSTER}")
-  endif()
+  set(board_target "${BOARD}/${target_soc}/${SB_CONFIG_FLASH_COMPANION_TARGET_CPUCLUSTER}")
 
   ExternalZephyrProject_Add(
     APPLICATION flash_companion
     SOURCE_DIR "${ZEPHYR_NRF_MODULE_DIR}/samples/suit/flash_companion"
     BOARD ${board_target}
+    BOARD_REVISION ${BOARD_REVISION}
   )
 endif()
diff --git a/tests/benchmarks/multicore/idle/sysbuild.cmake b/tests/benchmarks/multicore/idle/sysbuild.cmake
@@ -13,6 +13,7 @@ ExternalZephyrProject_Add(
     APPLICATION remote
     SOURCE_DIR ${APP_DIR}/remote
     BOARD ${SB_CONFIG_REMOTE_BOARD}
+    BOARD_REVISION ${BOARD_REVISION}
   )
 set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
 set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)

diff --git a/tests/subsys/event_manager_proxy/sysbuild.cmake b/tests/subsys/event_manager_proxy/sysbuild.cmake
@@ -13,6 +13,7 @@ ExternalZephyrProject_Add(
     APPLICATION remote
     SOURCE_DIR ${APP_DIR}/remote
     BOARD ${SB_CONFIG_REMOTE_BOARD}
+    BOARD_REVISION ${BOARD_REVISION}
   )
 set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
 set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)

diff --git a/tests/subsys/pcd/sysbuild.cmake b/tests/subsys/pcd/sysbuild.cmake
@@ -13,6 +13,7 @@ ExternalZephyrProject_Add(
     APPLICATION hello_world
     SOURCE_DIR ${ZEPHYR_BASE}/samples/hello_world
     BOARD ${SB_CONFIG_REMOTE_BOARD}
+    BOARD_REVISION ${BOARD_REVISION}
   )
 
 set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES hello_world)