From 85d4ebcf51fa69a67e93df73387816011a347bc5 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 4 Jul 2025 15:09:12 +0100 Subject: [PATCH] soc: nordic: ironside: Fix bleeding config Fixes generating a library for devices that do not need it which gives a cmake warning Signed-off-by: Jamie McCrae --- soc/nordic/CMakeLists.txt | 2 +- soc/nordic/ironside/CMakeLists.txt | 3 --- soc/nordic/nrf54h/soc.c | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/soc/nordic/CMakeLists.txt b/soc/nordic/CMakeLists.txt index cba58ae5187..0c9e9184d6d 100644 --- a/soc/nordic/CMakeLists.txt +++ b/soc/nordic/CMakeLists.txt @@ -47,4 +47,4 @@ endif() add_subdirectory(${SOC_SERIES}) add_subdirectory(common) -add_subdirectory(ironside) +add_subdirectory_ifdef(CONFIG_NRF_IRONSIDE ironside) diff --git a/soc/nordic/ironside/CMakeLists.txt b/soc/nordic/ironside/CMakeLists.txt index a0a18fc94a8..cf68e8a1352 100644 --- a/soc/nordic/ironside/CMakeLists.txt +++ b/soc/nordic/ironside/CMakeLists.txt @@ -2,11 +2,8 @@ # SPDX-License-Identifier: Apache-2.0 zephyr_include_directories(include) - zephyr_library() - zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_CALL call.c) - zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_BOOT_REPORT boot_report.c) zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_CPUCONF_SERVICE cpuconf.c) zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_UPDATE_SERVICE update.c) diff --git a/soc/nordic/nrf54h/soc.c b/soc/nordic/nrf54h/soc.c index 0c43c617572..03d4cda4f9c 100644 --- a/soc/nordic/nrf54h/soc.c +++ b/soc/nordic/nrf54h/soc.c @@ -22,7 +22,10 @@ #include #include #include + +#if defined(CONFIG_SOC_NRF54H20_CPURAD_ENABLE) #include +#endif LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);