From fe1b0e31b7ea1090cc36b5e991f5a010cea97186 Mon Sep 17 00:00:00 2001 From: Marcin Szymczyk Date: Tue, 22 Apr 2025 14:59:17 +0200 Subject: [PATCH] soc: nordic: allow setting VPR_LAUNCHER support for out of tree SoCs Make the compilation of vpr_launcher dependent on sysbuild Kconfig that can be set by SoC. Signed-off-by: Marcin Szymczyk --- soc/nordic/Kconfig.sysbuild | 4 ++++ soc/nordic/common/vpr/Kconfig.sysbuild | 2 +- soc/nordic/nrf54h/Kconfig.sysbuild | 9 +++++++++ soc/nordic/nrf54l/Kconfig.sysbuild | 9 +++++++++ soc/nordic/nrf92/Kconfig.sysbuild | 9 +++++++++ 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 soc/nordic/nrf54h/Kconfig.sysbuild create mode 100644 soc/nordic/nrf54l/Kconfig.sysbuild create mode 100644 soc/nordic/nrf92/Kconfig.sysbuild diff --git a/soc/nordic/Kconfig.sysbuild b/soc/nordic/Kconfig.sysbuild index f146dac821e..a726d20c464 100644 --- a/soc/nordic/Kconfig.sysbuild +++ b/soc/nordic/Kconfig.sysbuild @@ -1,4 +1,8 @@ # Copyright (c) 2024 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 +config HAS_NORDIC_VPR_LAUNCHER_IMAGE + bool + rsource "common/vpr/Kconfig.sysbuild" +orsource "*/Kconfig.sysbuild" diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild index 4dcc06face8..b35ae3c0307 100644 --- a/soc/nordic/common/vpr/Kconfig.sysbuild +++ b/soc/nordic/common/vpr/Kconfig.sysbuild @@ -4,7 +4,7 @@ config VPR_LAUNCHER bool "VPR launcher" default y - depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF9280_CPUPPR) + depends on HAS_NORDIC_VPR_LAUNCHER_IMAGE help Include VPR launcher in build. VPR launcher is a minimal sample built for an ARM core that starts given VPR core. diff --git a/soc/nordic/nrf54h/Kconfig.sysbuild b/soc/nordic/nrf54h/Kconfig.sysbuild new file mode 100644 index 00000000000..2ea44b22e44 --- /dev/null +++ b/soc/nordic/nrf54h/Kconfig.sysbuild @@ -0,0 +1,9 @@ +# Copyright (c) 2025 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +if SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR + +config HAS_NORDIC_VPR_LAUNCHER_IMAGE + default y + +endif diff --git a/soc/nordic/nrf54l/Kconfig.sysbuild b/soc/nordic/nrf54l/Kconfig.sysbuild new file mode 100644 index 00000000000..7ad3f9b4f9e --- /dev/null +++ b/soc/nordic/nrf54l/Kconfig.sysbuild @@ -0,0 +1,9 @@ +# Copyright (c) 2025 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +if SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR + +config HAS_NORDIC_VPR_LAUNCHER_IMAGE + default y + +endif diff --git a/soc/nordic/nrf92/Kconfig.sysbuild b/soc/nordic/nrf92/Kconfig.sysbuild new file mode 100644 index 00000000000..613c73d3fc0 --- /dev/null +++ b/soc/nordic/nrf92/Kconfig.sysbuild @@ -0,0 +1,9 @@ +# Copyright (c) 2025 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +if SOC_NRF9280_CPUPPR + +config HAS_NORDIC_VPR_LAUNCHER_IMAGE + default y + +endif