From 486fd37de948181d4edeb4e7467585d4d565c600 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 29 Nov 2024 12:57:42 +0000 Subject: [PATCH] soc: nordic: Select symbol properly Correctly selects the Kconfig symbols for viper CPU clusters instead of having a reverse hwmv1 setup where the symbol has a choice Signed-off-by: Jamie McCrae --- soc/nordic/common/vpr/Kconfig | 4 +--- soc/nordic/nrf54h/Kconfig | 4 ++-- soc/nordic/nrf54l/Kconfig | 6 +++--- soc/nordic/nrf92/Kconfig | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/soc/nordic/common/vpr/Kconfig b/soc/nordic/common/vpr/Kconfig index 59550dad4b3..45f2489dd57 100644 --- a/soc/nordic/common/vpr/Kconfig +++ b/soc/nordic/common/vpr/Kconfig @@ -2,9 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config RISCV_CORE_NORDIC_VPR - bool "RISC-V Nordic VPR core" - default y - depends on DT_HAS_NORDIC_VPR_ENABLED + bool select ATOMIC_OPERATIONS_C select RISCV select RISCV_PRIVILEGED diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig index 0baab4121ad..95af5153892 100644 --- a/soc/nordic/nrf54h/Kconfig +++ b/soc/nordic/nrf54h/Kconfig @@ -59,9 +59,9 @@ config SOC_NRF54H20_CPURAD select SOC_NRF54H20_CPURAD_COMMON config SOC_NRF54H20_CPUPPR - depends on RISCV_CORE_NORDIC_VPR + select RISCV_CORE_NORDIC_VPR config SOC_NRF54H20_CPUFLPR - depends on RISCV_CORE_NORDIC_VPR + select RISCV_CORE_NORDIC_VPR rsource "gpd/Kconfig" diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig index 1a8f05ba89a..bb9fea6dd9b 100644 --- a/soc/nordic/nrf54l/Kconfig +++ b/soc/nordic/nrf54l/Kconfig @@ -31,13 +31,13 @@ config SOC_NRF54L15_CPUAPP select SOC_NRF54L_CPUAPP_COMMON config SOC_NRF54L05_CPUFLPR - depends on RISCV_CORE_NORDIC_VPR + select RISCV_CORE_NORDIC_VPR config SOC_NRF54L10_CPUFLPR - depends on RISCV_CORE_NORDIC_VPR + select RISCV_CORE_NORDIC_VPR config SOC_NRF54L15_CPUFLPR - depends on RISCV_CORE_NORDIC_VPR + select RISCV_CORE_NORDIC_VPR config SOC_NRF54L20_ENGA_CPUAPP select SOC_NRF54L_CPUAPP_COMMON diff --git a/soc/nordic/nrf92/Kconfig b/soc/nordic/nrf92/Kconfig index 1f60b944b76..7fdf57d61c3 100644 --- a/soc/nordic/nrf92/Kconfig +++ b/soc/nordic/nrf92/Kconfig @@ -47,4 +47,4 @@ config SOC_NRF9230_ENGB_CPURAD select NRFS_HAS_TEMP_SERVICE config SOC_NRF9230_ENGB_CPUPPR - depends on RISCV_CORE_NORDIC_VPR + select RISCV_CORE_NORDIC_VPR