sysbuild: Add image selection for FLPR core images

Allows selecting a core to be built for the FLPR core on supported
devices, with empty as the only user selectable image. Also moves
HPF into FLPR configuration and removes duplicate methods of
configuration

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

cmake/sysbuild/hpf.cmake

@@ -2,14 +2,14 @@
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
-# Apply snippet to both images. Assumption is that HPF image is called 'hpf'.
+# Apply snippet to both images.
 function(hpf_apply_snippets snippet)
   sysbuild_cache_set(VAR ${DEFAULT_IMAGE}_SNIPPET APPEND REMOVE_DUPLICATES ${snippet})
-  sysbuild_cache_set(VAR hpf_SNIPPET APPEND REMOVE_DUPLICATES ${snippet})
+  sysbuild_cache_set(VAR ${SB_CONFIG_FLPRCORE_IMAGE_NAME}_SNIPPET APPEND REMOVE_DUPLICATES ${snippet})
 endfunction()
 
 function(hpf_apply_flpr_fault_timer_params timeout)
-  set_config_bool(hpf CONFIG_HPF_MSPI_FAULT_TIMER y)
+  set_config_bool(${SB_CONFIG_FLPRCORE_IMAGE_NAME} CONFIG_HPF_MSPI_FAULT_TIMER y)
   set_config_bool(${DEFAULT_IMAGE} CONFIG_MSPI_HPF_FAULT_TIMER y)
   set_config_int(${DEFAULT_IMAGE} CONFIG_MSPI_HPF_FAULT_TIMEOUT ${timeout})
 endfunction()
@@ -30,7 +30,7 @@ if(SB_CONFIG_HPF)
     endif()
   endif()
   if(SB_CONFIG_HPF_DEVELOPER_MODE)
-    set_config_bool(hpf CONFIG_HPF_DEVELOPER_MODE y)
+    set_config_bool(${SB_CONFIG_FLPRCORE_IMAGE_NAME} CONFIG_HPF_DEVELOPER_MODE y)
   endif()
 
   if(SB_CONFIG_HPF_APPLY_SNIPPET)

sysbuild/CMakeLists.txt

@@ -902,9 +902,9 @@ include(ncs_sysbuild_extensions)
 include(${CMAKE_CURRENT_LIST_DIR}/extensions.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/appcore.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/netcore.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/flprcore.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/pprcore.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/secureboot.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/mcuboot.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/hpf.cmake)
 
 store_ncs_vars()

sysbuild/Kconfig.flprcore

@@ -12,4 +12,57 @@ config FLPRCORE_REMOTE_BOARD_TARGET_CPUCLUSTER
 	string
 	default "cpuflpr"
 
+menu "Fast lightweight peripheral processor core (FLPR) configuration"
+	depends on SUPPORT_FLPRCORE
+
+config SUPPORT_FLPRCORE_EMPTY
+	bool
+	default y
+
+config DEFAULT_FLPRCORE_EMPTY
+	bool
+
+choice FLPRCORE
+	prompt "FLPR core image" if !HPF
+	default FLPRCORE_EMPTY if DEFAULT_FLPRCORE_EMPTY && FLPRCORE_REMOTE_BOARD_TARGET_CPUCLUSTER != ""
+	depends on SUPPORT_FLPRCORE
+
+config FLPRCORE_NONE
+	bool "None"
+	help
+	  Do not include a FLPR core image in the build.
+
+config FLPRCORE_EMPTY
+	bool "Empty"
+	depends on SUPPORT_FLPRCORE_EMPTY
+	help
+	  Include empty image as the FLPR core image to use.
+
+endchoice
+
+if !FLPRCORE_NONE || HPF
+
+config FLPRCORE_IMAGE_NAME
+	string
+	default "empty_flpr_core" if FLPRCORE_EMPTY
+	default "hpf_gpio" if HPF_GPIO
+	default "hpf_mspi" if HPF_MSPI
+	help
+	  Name of FLPR core image.
+
+config FLPRCORE_IMAGE_PATH
+	string
+	default "$(ZEPHYR_NRF_MODULE_DIR)/samples/basic/empty" if FLPRCORE_EMPTY
+	default "$(ZEPHYR_NRF_MODULE_DIR)/applications/hpf/gpio" if HPF_GPIO
+	default "$(ZEPHYR_NRF_MODULE_DIR)/applications/hpf/mspi" if HPF_MSPI
+	help
+	  Source directory of FLPR core image.
+
+endif # !FLPRCORE_NONE
+
+# Include high performance framework which provides it's own FLPR configuration
+rsource "Kconfig.hpf"
+
+endmenu
+
 endif # SUPPORT_FLPRCORE

sysbuild/Kconfig.hpf

@@ -23,13 +23,6 @@ endchoice
 config HPF_DEVELOPER_MODE
 	bool "HPF developer mode"
 
-config HPF_IMAGE_PATH
-	string
-	default "$(ZEPHYR_NRF_MODULE_DIR)/applications/hpf/gpio" if HPF_GPIO
-	default "$(ZEPHYR_NRF_MODULE_DIR)/applications/hpf/mspi" if HPF_MSPI
-	help
-	  Source directory of HPF image.
-
 config HPF_APPLY_SNIPPET
 	bool "Apply HPF overlay snippet"
 	default y

sysbuild/Kconfig.sysbuild

@@ -79,7 +79,6 @@ rsource "Kconfig.bt_fast_pair"
 rsource "Kconfig.zip"
 rsource "Kconfig.matter"
 rsource "Kconfig.wifi"
-rsource "Kconfig.hpf"
 rsource "Kconfig.approtect"
 rsource "Kconfig.lwm2m_carrier"
 rsource "Kconfig.cracen"

sysbuild/flprcore.cmake

@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+# Include FLPR core image if enabled
+if(SB_CONFIG_SUPPORT_FLPRCORE AND NOT SB_CONFIG_FLPRCORE_NONE AND DEFINED SB_CONFIG_FLPRCORE_IMAGE_NAME)
+  # Calculate the FLPR core board target
+  string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}")
+  list(GET split_board_qualifiers 1 target_soc)
+  list(GET split_board_qualifiers 2 target_cpucluster)
+  set(board_target_flprcore "${BOARD}/${target_soc}/${SB_CONFIG_FLPRCORE_REMOTE_BOARD_TARGET_CPUCLUSTER}")
+  set(target_soc)
+  set(target_cpucluster)
+
+  ExternalZephyrProject_Add(
+    APPLICATION ${SB_CONFIG_FLPRCORE_IMAGE_NAME}
+    SOURCE_DIR ${SB_CONFIG_FLPRCORE_IMAGE_PATH}
+    BOARD ${board_target_flprcore}
+    BOARD_REVISION ${BOARD_REVISION}
+  )
+endif()