diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild index cfbd619f623..eb62e3708bf 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_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR) + depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF9280_CPUPPR) 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/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig index 35c698c7b08..2698bc72329 100644 --- a/soc/nordic/nrf54l/Kconfig +++ b/soc/nordic/nrf54l/Kconfig @@ -46,6 +46,9 @@ config SOC_NRF54L15_CPUFLPR config SOC_NRF54L20_ENGA_CPUAPP select SOC_NRF54L_CPUAPP_COMMON +config SOC_NRF54L20_ENGA_CPUFLPR + select RISCV_CORE_NORDIC_VPR + if SOC_SERIES_NRF54LX config SOC_NRF54LX_SKIP_CLOCK_CONFIG diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuflpr new file mode 100644 index 00000000000..dd8fed9db58 --- /dev/null +++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuflpr @@ -0,0 +1,11 @@ +# Nordic Semiconductor nRF54L20 MCU + +# Copyright (c) 2025 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +if SOC_NRF54L20_ENGA_CPUFLPR + +config NUM_IRQS + default 306 + +endif # SOC_NRF54L20_ENGA_CPUFLPR diff --git a/soc/nordic/nrf54l/Kconfig.soc b/soc/nordic/nrf54l/Kconfig.soc index e1feb7cdef1..f86b7bd4858 100644 --- a/soc/nordic/nrf54l/Kconfig.soc +++ b/soc/nordic/nrf54l/Kconfig.soc @@ -93,6 +93,12 @@ config SOC_NRF54L20_ENGA_CPUAPP help NRF54L20 ENGA CPUAPP +config SOC_NRF54L20_ENGA_CPUFLPR + bool + select SOC_NRF54L20_ENGA + help + NRF54L20 ENGA CPUFLPR + config SOC default "nrf54l05" if SOC_NRF54L05 default "nrf54l09" if SOC_NRF54L09 diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml index b4c8ef5a034..1e9ecac5f28 100644 --- a/soc/nordic/soc.yml +++ b/soc/nordic/soc.yml @@ -39,6 +39,7 @@ family: - name: nrf54l20 cpuclusters: - name: cpuapp + - name: cpuflpr - name: nrf54h socs: - name: nrf54h20 diff --git a/soc/nordic/validate_base_addresses.c b/soc/nordic/validate_base_addresses.c index ef1dd194578..ac800f1cf00 100644 --- a/soc/nordic/validate_base_addresses.c +++ b/soc/nordic/validate_base_addresses.c @@ -339,7 +339,7 @@ CHECK_DT_REG(usbreg, NRF_USBREGULATOR); CHECK_DT_REG(vmc, NRF_VMC); CHECK_DT_REG(cpuflpr_clic, NRF_FLPR_VPRCLIC); CHECK_DT_REG(cpuppr_clic, NRF_PPR_VPRCLIC); -#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15) +#if defined(CONFIG_SOC_SERIES_NRF54LX) CHECK_DT_REG(cpuflpr_vpr, NRF_VPR00); #elif defined(CONFIG_NRF_PLATFORM_HALTIUM) CHECK_DT_REG(cpuflpr_vpr, NRF_VPR121);