intel_adsp: cavs: build multiprocessing code conditionally

Build code conditionally and depend on CONFIG_INTEL_ADSP_CAVS. Signed-off-by: Anas Nashif <[email protected]>
thedjnK · Mar 1, 2022 · 985085a · 985085a
1 parent d4ab61c
commit 985085a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/soc/xtensa/intel_adsp/common/CMakeLists.txt b/soc/xtensa/intel_adsp/common/CMakeLists.txt
@@ -15,9 +15,11 @@ zephyr_library_sources(rimage_modules.c)
 zephyr_library_sources(boot.c)
 zephyr_library_sources(cavs_ipc.c)
 
-if(CONFIG_MP_NUM_CPUS GREATER 1)
+if(CONFIG_SMP OR CONFIG_MP_NUM_CPUS GREATER 1)
   zephyr_library_sources(soc_mp.c)
-  zephyr_library_sources(mp_cavs.c)
+  if(CONFIG_INTEL_ADSP_CAVS)
+    zephyr_library_sources(mp_cavs.c)
+  endif()
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_CAVS_ICTL irq-cavs.c)

diff --git a/soc/xtensa/intel_adsp/common/soc.c b/soc/xtensa/intel_adsp/common/soc.c
@@ -104,11 +104,6 @@ static __imr void power_init(void)
 #endif
 }
 
-#if !DT_NODE_EXISTS(DT_NODELABEL(cavs0)) || CONFIG_MP_NUM_CPUS == 1
-void arch_sched_ipi(void) {}
-#endif
-
-
 static __imr int soc_init(const struct device *dev)
 {
 	if (IS_ENABLED(CONFIG_SOC_SERIES_INTEL_CAVS_V15)) {