From e501b54bad9ca75dbac393f508b13f6b23c6dad9 Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Mon, 16 Dec 2024 15:48:57 +0100 Subject: [PATCH] soc: nordic: add common symbol for RAM control helper presence Common symbol is defined by SoCs that support RAM control helper. Signed-off-by: Nikodem Kastelik --- drivers/retained_mem/Kconfig.nrf | 2 +- modules/hal_nordic/nrfx/CMakeLists.txt | 2 +- soc/nordic/common/Kconfig | 3 +++ soc/nordic/nrf52/Kconfig | 1 + soc/nordic/nrf54h/Kconfig | 2 ++ soc/nordic/nrf54l/Kconfig | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/retained_mem/Kconfig.nrf b/drivers/retained_mem/Kconfig.nrf index 348361e5f6f..70aef8b504f 100644 --- a/drivers/retained_mem/Kconfig.nrf +++ b/drivers/retained_mem/Kconfig.nrf @@ -13,6 +13,6 @@ config RETAINED_MEM_NRF_RAM_CTRL bool "nRF RAM retention driver" default y depends on DT_HAS_ZEPHYR_RETAINED_RAM_ENABLED && RETAINED_MEM_ZEPHYR_RAM && POWEROFF - depends on SOC_FAMILY_NORDIC_NRF + depends on HAS_NORDIC_RAM_CTRL help Enable driver for Nordic RAM retention. diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt index bd0526da116..94e1eef51cf 100644 --- a/modules/hal_nordic/nrfx/CMakeLists.txt +++ b/modules/hal_nordic/nrfx/CMakeLists.txt @@ -111,7 +111,7 @@ zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF92X ${MDK_DIR}/system_nrf92.c zephyr_library_sources(nrfx_glue.c) zephyr_library_sources(${HELPERS_DIR}/nrfx_flag32_allocator.c) -zephyr_library_sources_ifdef(CONFIG_RETAINED_MEM_NRF_RAM_CTRL ${HELPERS_DIR}/nrfx_ram_ctrl.c) +zephyr_library_sources_ifdef(CONFIG_HAS_NORDIC_RAM_CTRL ${HELPERS_DIR}/nrfx_ram_ctrl.c) zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI ${HELPERS_DIR}/nrfx_gppi_dppi.c) zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI ${HELPERS_DIR}/nrfx_gppi_ppi.c) diff --git a/soc/nordic/common/Kconfig b/soc/nordic/common/Kconfig index f337358e30d..a5bae67d5a1 100644 --- a/soc/nordic/common/Kconfig +++ b/soc/nordic/common/Kconfig @@ -4,6 +4,9 @@ config HAS_NORDIC_DMM bool +config HAS_NORDIC_RAM_CTRL + bool + config NRF_SYS_EVENT bool "nRF system event support" select NRFX_POWER if !NRF_PLATFORM_HALTIUM diff --git a/soc/nordic/nrf52/Kconfig b/soc/nordic/nrf52/Kconfig index adb57916627..edc2b70d667 100644 --- a/soc/nordic/nrf52/Kconfig +++ b/soc/nordic/nrf52/Kconfig @@ -11,6 +11,7 @@ config SOC_SERIES_NRF52X imply XIP select HAS_NRFX select HAS_NORDIC_DRIVERS + select HAS_NORDIC_RAM_CTRL select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE select HAS_SWO select HAS_POWEROFF diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig index 3991cd94785..10428b77ec7 100644 --- a/soc/nordic/nrf54h/Kconfig +++ b/soc/nordic/nrf54h/Kconfig @@ -21,6 +21,7 @@ config SOC_NRF54H20_CPUAPP_COMMON select CPU_HAS_FPU select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS select HAS_NORDIC_DMM + select HAS_NORDIC_RAM_CTRL select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE select NRFS_HAS_CLOCK_SERVICE select NRFS_HAS_DVFS_SERVICE @@ -54,6 +55,7 @@ config SOC_NRF54H20_CPURAD_COMMON select NRFS_HAS_TEMP_SERVICE select NRFS_HAS_VBUS_DETECTOR_SERVICE select HAS_NORDIC_DMM + select HAS_NORDIC_RAM_CTRL select HAS_PM select HAS_POWEROFF diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig index 575fbbdcedc..de8f0a399f8 100644 --- a/soc/nordic/nrf54l/Kconfig +++ b/soc/nordic/nrf54l/Kconfig @@ -20,6 +20,7 @@ config SOC_NRF54L_CPUAPP_COMMON select CPU_HAS_FPU select HAS_HW_NRF_RADIO_IEEE802154 select HAS_POWEROFF + select HAS_NORDIC_RAM_CTRL config SOC_NRF54L05_CPUAPP select SOC_NRF54L_CPUAPP_COMMON