cmake: sysbuild: add new HARNESS APP_TYPE, and dump APP_TYPE into domain

west flash will be able to read this APP_TYPE info and then
flash the image into different boards for multiple devices testing

Signed-off-by: Jingsai Lu <[email protected]>

Author: JingsaiLu

samples/bluetooth/central_ht/sample.yaml

@@ -9,6 +9,7 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
     tags: bluetooth
+    sysbuild: true
     integration_platforms:
       - qemu_cortex_m3
   sample.bluetooth.central_ht.nxp:

samples/bluetooth/central_ht/sysbuild.conf

@@ -0,0 +1 @@
+SB_CONFIG_HARNESS_APPS="samples/bluetooth/peripheral_ht"

scripts/pylib/build_helpers/domains.py

@@ -40,6 +40,9 @@
           build_dir:
             required: true
             type: str
+          app_type:
+            required: false
+            type: str
   flash_order:
     required: false
     type: seq

share/sysbuild/cmake/domains.cmake

@@ -10,6 +10,7 @@ set(domains_yaml "${domains_yaml}\ndomains:")
 foreach(image ${IMAGES})
   set(domains_yaml "${domains_yaml}\n  - name: ${image}")
   set(domains_yaml "${domains_yaml}\n    build_dir: $<TARGET_PROPERTY:${image},_EP_BINARY_DIR>")
+  set(domains_yaml "${domains_yaml}\n    app_type: $<TARGET_PROPERTY:${image},APP_TYPE>")
 endforeach()
 set(domains_yaml "${domains_yaml}\nflash_order:")
 foreach(image ${IMAGES_FLASHING_ORDER})

share/sysbuild/cmake/modules/sysbuild_extensions.cmake

@@ -216,7 +216,7 @@ endfunction()
 #                             and debugging.
 #
 function(ExternalZephyrProject_Add)
-  set(app_types MAIN BOOTLOADER)
+  set(app_types MAIN BOOTLOADER HARNESS)
   cmake_parse_arguments(ZBUILD "" "APPLICATION;BOARD;BOARD_REVISION;SOURCE_DIR;APP_TYPE;BUILD_ONLY" "" ${ARGN})
 
   if(ZBUILD_UNPARSED_ARGUMENTS)
@@ -387,6 +387,10 @@ function(ExternalZephyrProject_Add)
   set(image_default "${CMAKE_SOURCE_DIR}/image_configurations/ALL_image_default.cmake")
 
   if(DEFINED ZBUILD_APP_TYPE)
+    # reuse image_configurations for HARNESS APPLICATION
+    if("${ZBUILD_APP_TYPE}" STREQUAL "HARNESS")
+      set(ZBUILD_APP_TYPE "MAIN")
+    endif()
     list(APPEND image_default "${CMAKE_SOURCE_DIR}/image_configurations/${ZBUILD_APP_TYPE}_image_default.cmake")
   endif()
 

share/sysbuild/images/CMakeLists.txt

@@ -36,21 +36,19 @@ set(SYSBUILD_CURRENT_CMAKE_DIR)
 sysbuild_add_subdirectory(boards)
 sysbuild_add_subdirectory(soc)
 
-# parse harness app list from SB_CONFIG_HARNESS_APPS and 
-# add these app projects into sysbuild system.
+# parse and add harness app list from SB_CONFIG_HARNESS_APPS.
 if(SB_CONFIG_HARNESS_APPS)
   string(REPLACE "," ";" items "${SB_CONFIG_HARNESS_APPS}")
   message("SB_CONFIG_HARNESS_APPS: ${SB_CONFIG_HARNESS_APPS}")
-  message("items: ${items}")
 
   foreach(item IN LISTS items)
-    message("item: ${item}")
+    message("Adding Zephyr Project:${item} as HARNESS")
     string(REPLACE "/" "_" app_name ${item})
-    message("app_name: ${app_name}")
     ExternalZephyrProject_Add(
         APPLICATION ${app_name}
         SOURCE_DIR ${ZEPHYR_BASE}/${item}
         BOARD ${BOARD}
+        APP_TYPE HARNESS
       )
   endforeach()
 endif()

share/sysbuild/images/Kconfig

@@ -8,4 +8,4 @@ rsource "bootloader/Kconfig"
 config HARNESS_APPS
 	string "List of harness apps"
 	help
-	  List of harness apps to be built.
+	  List of harness apps to be built.