sysbuild: add SoC-specific sysbuild configuration

Sysbuild now supports SoC configuration, in addition to application and board. Signed-off-by: Marcin Szymczyk <[email protected]>
zephyrproject-rtos · Apr 10, 2024 · d624364 · d624364
1 parent 9c05618
commit d624364
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/cmake/modules/hwm_v2.cmake b/cmake/modules/hwm_v2.cmake
@@ -12,6 +12,7 @@
 # - Kconfig.defconfig: Contains references to SoC defconfig files for Zephyr integration.
 # - Kconfig: Contains references to regular SoC Kconfig files for Zephyr integration.
 # - Kconfig.soc: Contains references to generic SoC Kconfig files.
+# - Kconfig.sysbuild: Contains references to SoC sysbuild Kconfig files.
 #
 # The following file is generated in '<kconfig-binary-dir>/arch'
 # - Kconfig: Contains references to regular arch Kconfig files for Zephyr integration.
@@ -96,19 +97,23 @@ set(arch_kconfig_file  Kconfig)
 set(soc_defconfig_file Kconfig.defconfig)
 set(soc_zephyr_file    Kconfig)
 set(soc_kconfig_file   Kconfig.soc)
+set(soc_sysbuild_file  Kconfig.sysbuild)
 set(arch_kconfig_header "# Load arch Kconfig descriptions.\n")
 set(defconfig_header    "# Load Zephyr SoC Kconfig defconfig.\n")
 set(soc_zephyr_header   "# Load Zephyr SoC Kconfig descriptions.\n")
 set(soc_kconfig_header  "# Load SoC Kconfig descriptions.\n")
+set(soc_sysbuild_header "# Load SoC sysbuild Kconfig descriptions.\n")
 file(WRITE ${KCONFIG_BINARY_DIR}/arch/${arch_kconfig_file} "${arch_kconfig_header}")
 file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_defconfig_file} "${defconfig_header}")
 file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_zephyr_file}    "${soc_zephyr_header}")
 file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_kconfig_file}   "${soc_kconfig_header}")
+file(WRITE ${KCONFIG_BINARY_DIR}/soc/${soc_sysbuild_file}  "${soc_sysbuild_header}")
 
 kconfig_gen("${KCONFIG_BINARY_DIR}/arch" "${arch_kconfig_file}" "${kconfig_arch_source_dir}")
 kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_defconfig_file}" "${kconfig_soc_source_dir}")
 kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_zephyr_file}" "${kconfig_soc_source_dir}")
 kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_kconfig_file}" "${kconfig_soc_source_dir}")
+kconfig_gen("${KCONFIG_BINARY_DIR}/soc" "${soc_sysbuild_file}" "${kconfig_soc_source_dir}")
 
 # Clear variables created by cmake_parse_arguments
 unset(SOC_V2_NAME)

diff --git a/share/sysbuild/Kconfig b/share/sysbuild/Kconfig
@@ -7,6 +7,7 @@ rsource "Kconfig.$(HWM_SCHEME)"
 comment "Sysbuild image configuration"
 
 osource "$(BOARD_DIR)/Kconfig.sysbuild"
+osource "$(KCONFIG_BINARY_DIR)/soc/Kconfig.sysbuild"
 
 menu "Modules"
 

diff --git a/share/sysbuild/images/CMakeLists.txt b/share/sysbuild/images/CMakeLists.txt
@@ -32,5 +32,6 @@ endforeach()
 set(SYSBUILD_CURRENT_MODULE_DIR)
 set(SYSBUILD_CURRENT_CMAKE_DIR)
 
-# This allows for board specific images to be included.
+# This allows for board and SoC specific images to be included.
 sysbuild_add_subdirectory(boards)
+sysbuild_add_subdirectory(soc)
diff --git a/share/sysbuild/images/soc/CMakeLists.txt b/share/sysbuild/images/soc/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+
+include(${SOC_${SB_CONFIG_SOC}_DIR}/sysbuild.cmake OPTIONAL)