cmake/zephyr: unify cmake rules for src/lib

Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/lib/ instead.

Link: #8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Author: kv2019i

src/lib/CMakeLists.txt

@@ -1,31 +1,46 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
+set(common_files notifier.c dma.c dai.c)
+
 if(CONFIG_LIBRARY)
-	add_local_sources(sof
-		lib.c
-		dai.c
-		dma.c
-		notifier.c
-                agent.c)
-	return()
+  add_local_sources(sof
+    lib.c
+    agent.c
+    ${common_files}
+    )
+  return()
 endif()
 
 if(CONFIG_HAVE_AGENT)
-	add_local_sources(sof agent.c)
+  add_local_sources(sof agent.c)
 endif()
 
-add_local_sources(sof
-	lib.c
-	alloc.c
-	notifier.c
-	pm_runtime.c
-	clk.c
-	dma.c
-	dai.c
-	wait.c
-	cpu-clk-manager.c
-)
-
 if(CONFIG_AMS)
-add_local_sources(sof ams.c)
+  add_local_sources(sof ams.c)
+endif()
+
+if(CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL)
+  add_local_sources(sof cpu-clk-manager.c)
+endif()
+
+is_zephyr(zephyr)
+if(zephyr) ###  Zephyr ###
+
+  add_local_sources(sof ${common_files})
+
+  if(NOT CONFIG_SOF_ZEPHYR_NO_SOF_CLOCK)
+    add_local_sources(sof clk.c)
+  endif()
+
+else() ### XTOS ###
+
+  add_local_sources(sof
+    ${common_files}
+    lib.c
+    alloc.c
+    pm_runtime.c
+    clk.c
+    wait.c
+    )
+
 endif()

zephyr/CMakeLists.txt

@@ -135,7 +135,6 @@ set(SOF_SRC_PATH "${sof_top_dir}/src")
 
 set(SOF_PLATFORM_PATH "${SOF_SRC_PATH}/platform")
 set(SOF_SAMPLES_PATH "${SOF_SRC_PATH}/samples")
-set(SOF_LIB_PATH "${SOF_SRC_PATH}/lib")
 set(SOF_DRIVERS_PATH "${SOF_SRC_PATH}/drivers")
 set(SOF_TRACE_PATH "${SOF_SRC_PATH}/trace")
 
@@ -209,6 +208,7 @@ add_subdirectory(../src/audio/ audio_unused_install/)
 add_subdirectory(../src/debug/ debug_unused_install/)
 add_subdirectory(../src/init/ init_unused_install/)
 add_subdirectory(../src/ipc/  ipc_unused_install/)
+add_subdirectory(../src/lib/ lib_unused_install/)
 add_subdirectory(../src/schedule/  schedule_unused_install/)
 add_subdirectory(test/)
 
@@ -455,11 +455,6 @@ zephyr_include_directories(${SOF_PLATFORM_PATH}/${PLATFORM}/include)
 # Commented files will be added/removed as integration dictates.
 zephyr_library_sources(
 
-	# SOF library - parts to transition to Zephyr over time
-	${SOF_LIB_PATH}/notifier.c
-	${SOF_LIB_PATH}/dma.c
-	${SOF_LIB_PATH}/dai.c
-
 	# SOF core infrastructure - runs on top of Zephyr
 	${SOF_SRC_PATH}/arch/xtensa/drivers/cache_attr.c
 
@@ -477,14 +472,6 @@ zephyr_library_sources(
 	lib.c
 )
 
-if(NOT CONFIG_SOF_ZEPHYR_NO_SOF_CLOCK)
-	zephyr_library_sources(${SOF_LIB_PATH}/clk.c)
-endif()
-
-zephyr_library_sources_ifdef(CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL
-	${SOF_LIB_PATH}/cpu-clk-manager.c
-)
-
 # SOF module interface functions
 add_subdirectory(../src/module module_unused_install/)
 
@@ -542,14 +529,6 @@ zephyr_library_sources_ifdef(CONFIG_MULTICORE
 	${SOF_SRC_PATH}/idc/idc.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_HAVE_AGENT
-	${SOF_LIB_PATH}/agent.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_AMS
-	${SOF_LIB_PATH}/ams.c
-)
-
 zephyr_library_sources_ifdef(CONFIG_DW_DMA
 	${SOF_DRIVERS_PATH}/dw/dma.c
 )