cmake/zephyr: unify cmake rules for src/audio/eq-iir and eq-fir

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/audio/eq-iir
and src/audio/eq-fir instead.

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

Author: kv2019i

src/audio/CMakeLists.txt

@@ -14,6 +14,12 @@ set(base_files
 if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 	add_subdirectory(buffers)
 	add_subdirectory(pipeline)
+	if(CONFIG_COMP_FIR)
+		add_subdirectory(eq_fir)
+	endif()
+	if(CONFIG_COMP_IIR)
+		add_subdirectory(eq_iir)
+	endif()
 	if(CONFIG_COMP_SRC)
 		add_subdirectory(src)
 	endif()
@@ -47,12 +53,6 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 		${base_files}
 	)
 
-	if(CONFIG_COMP_FIR)
-		add_subdirectory(eq_fir)
-	endif()
-	if(CONFIG_COMP_IIR)
-		add_subdirectory(eq_iir)
-	endif()
 	if(CONFIG_COMP_DCBLOCK)
 		add_subdirectory(dcblock)
 	endif()

src/audio/eq_fir/CMakeLists.txt

@@ -1,9 +1,29 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_local_sources(sof eq_fir.c eq_fir_generic.c eq_fir_hifi2ep.c eq_fir_hifi3.c)
+set(base_files eq_fir.c eq_fir_generic.c eq_fir_hifi2ep.c eq_fir_hifi3.c)
+
 if(CONFIG_IPC_MAJOR_3)
-	add_local_sources(sof eq_fir_ipc3.c)
+  list(APPEND base_files eq_fir_ipc3.c)
 elseif(CONFIG_IPC_MAJOR_4)
-	add_local_sources(sof eq_fir_ipc4.c)
+  list(APPEND base_files eq_fir_ipc4.c)
 endif()
 
+is_zephyr(it_is)
+if(it_is) ###  Zephyr ###
+
+  if(CONFIG_COMP_FIR STREQUAL "m")
+
+    add_subdirectory(llext ${PROJECT_BINARY_DIR}/eq_fir_llext)
+    add_dependencies(app eq_fir)
+
+  else()
+
+    zephyr_library_sources(${base_files})
+
+  endif()
+
+else() ### XTOS ###
+
+  add_local_sources(sof ${base_files})
+
+endif()

src/audio/eq_iir/CMakeLists.txt

@@ -1,8 +1,29 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_local_sources(sof eq_iir.c eq_iir_generic.c)
+set(base_files eq_iir.c eq_iir_generic.c)
+
 if(CONFIG_IPC_MAJOR_3)
-	add_local_sources(sof eq_iir_ipc3.c)
+  list(APPEND base_files eq_iir_ipc3.c)
 elseif(CONFIG_IPC_MAJOR_4)
-	add_local_sources(sof eq_iir_ipc4.c)
+  list(APPEND base_files eq_iir_ipc4.c)
+endif()
+
+is_zephyr(it_is)
+if(it_is) ###  Zephyr ###
+
+  if(CONFIG_COMP_FIR STREQUAL "m")
+
+    add_subdirectory(llext ${PROJECT_BINARY_DIR}/eq_iir_llext)
+    add_dependencies(app eq_iir)
+
+  else()
+
+    zephyr_library_sources(${base_files})
+
+  endif()
+
+else() ### XTOS ###
+
+  add_local_sources(sof ${base_files})
+
 endif()

zephyr/CMakeLists.txt

@@ -506,32 +506,6 @@ elseif(CONFIG_IPC_MAJOR_4)
 set(ipc_suffix ipc4)
 endif()
 
-if(CONFIG_COMP_FIR STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/eq_fir/llext
-			 ${PROJECT_BINARY_DIR}/eq_fir_llext)
-	add_dependencies(app eq_fir)
-elseif(CONFIG_COMP_FIR)
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/eq_fir/eq_fir_hifi3.c
-		${SOF_AUDIO_PATH}/eq_fir/eq_fir_hifi2ep.c
-		${SOF_AUDIO_PATH}/eq_fir/eq_fir_generic.c
-		${SOF_AUDIO_PATH}/eq_fir/eq_fir.c
-		${SOF_AUDIO_PATH}/eq_fir/eq_fir_${ipc_suffix}.c
-	)
-endif()
-
-if(CONFIG_COMP_IIR STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/eq_iir/llext
-			 ${PROJECT_BINARY_DIR}/eq_iir_llext)
-	add_dependencies(app eq_iir)
-elseif(CONFIG_COMP_IIR)
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/eq_iir/eq_iir.c
-		${SOF_AUDIO_PATH}/eq_iir/eq_iir_${ipc_suffix}.c
-		${SOF_AUDIO_PATH}/eq_iir/eq_iir_generic.c
-	)
-endif()
-
 if(CONFIG_COMP_ASRC STREQUAL "m")
 	add_subdirectory(${SOF_AUDIO_PATH}/asrc/llext
 			 ${PROJECT_BINARY_DIR}/asrc_llext)