From 1dfe3cba99a4e2267b08f4c1991f230dff511aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?= Date: Tue, 25 Feb 2025 07:01:28 +0100 Subject: [PATCH] soc: nordic: common: vpr: Update custom idle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit VPR (FLPR) on nRF54L series has fixed issue with sleeping so custom CPU idle function does not need to be used there. Signed-off-by: Krzysztof Chruściński --- soc/nordic/common/vpr/CMakeLists.txt | 3 ++- soc/nordic/common/vpr/Kconfig | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/soc/nordic/common/vpr/CMakeLists.txt b/soc/nordic/common/vpr/CMakeLists.txt index cf14c817a1b..5a4fe40dbcf 100644 --- a/soc/nordic/common/vpr/CMakeLists.txt +++ b/soc/nordic/common/vpr/CMakeLists.txt @@ -3,6 +3,7 @@ zephyr_include_directories(.) -zephyr_library_sources(soc_context.S soc_idle.c soc_init.c) +zephyr_library_sources(soc_context.S soc_init.c) +zephyr_library_sources_ifdef(CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE soc_idle.c) set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/riscv/common/linker.ld CACHE INTERNAL "") diff --git a/soc/nordic/common/vpr/Kconfig b/soc/nordic/common/vpr/Kconfig index 6c207afcd3a..bdcf9236fac 100644 --- a/soc/nordic/common/vpr/Kconfig +++ b/soc/nordic/common/vpr/Kconfig @@ -16,8 +16,8 @@ config RISCV_CORE_NORDIC_VPR select RISCV_HAS_CLIC select RISCV_SOC_CONTEXT_SAVE select HAS_FLASH_LOAD_OFFSET - select ARCH_HAS_CUSTOM_CPU_IDLE - select ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE + select ARCH_HAS_CUSTOM_CPU_IDLE if !SOC_SERIES_NRF54LX + select ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE if !SOC_SERIES_NRF54LX select INCLUDE_RESET_VECTOR imply XIP help