cmake/zephyr: unify cmake rules for src/audio/dcblock

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/dcblock instead

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

Author: kv2019i

src/audio/CMakeLists.txt

@@ -17,6 +17,9 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 	if(CONFIG_COMP_ASRC)
 		add_subdirectory(asrc)
 	endif()
+	if(CONFIG_COMP_DCBLOCK)
+		add_subdirectory(dcblock)
+	endif()
 	if(CONFIG_COMP_FIR)
 		add_subdirectory(eq_fir)
 	endif()
@@ -56,9 +59,6 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 		${base_files}
 	)
 
-	if(CONFIG_COMP_DCBLOCK)
-		add_subdirectory(dcblock)
-	endif()
 	if(CONFIG_COMP_CROSSOVER)
 		add_subdirectory(crossover)
 	endif()

src/audio/dcblock/CMakeLists.txt

@@ -1,10 +1,16 @@
+if(CONFIG_COMP_DCBLOCK STREQUAL "m")
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/dcblock_llext)
+  add_dependencies(app dcblock)
+  return()
+endif()
+
 add_local_sources(sof dcblock.c)
 add_local_sources(sof dcblock_generic.c)
 add_local_sources(sof dcblock_hifi3.c)
 add_local_sources(sof dcblock_hifi4.c)
 
 if(CONFIG_IPC_MAJOR_3)
-	add_local_sources(sof dcblock_ipc3.c)
+  add_local_sources(sof dcblock_ipc3.c)
 elseif(CONFIG_IPC_MAJOR_4)
-	add_local_sources(sof dcblock_ipc4.c)
+  add_local_sources(sof dcblock_ipc4.c)
 endif()

zephyr/CMakeLists.txt

@@ -506,20 +506,6 @@ elseif(CONFIG_IPC_MAJOR_4)
 set(ipc_suffix ipc4)
 endif()
 
-if(CONFIG_COMP_DCBLOCK STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/dcblock/llext
-			 ${PROJECT_BINARY_DIR}/dcblock_llext)
-	add_dependencies(app dcblock)
-elseif(CONFIG_COMP_DCBLOCK)
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/dcblock/dcblock_generic.c
-		${SOF_AUDIO_PATH}/dcblock/dcblock.c
-		${SOF_AUDIO_PATH}/dcblock/dcblock_hifi3.c
-		${SOF_AUDIO_PATH}/dcblock/dcblock_hifi4.c
-		${SOF_AUDIO_PATH}/dcblock/dcblock_${ipc_suffix}.c
-	)
-endif()
-
 if(CONFIG_COMP_SEL STREQUAL "m")
 	add_subdirectory(${SOF_AUDIO_PATH}/selector/llext
 			 ${PROJECT_BINARY_DIR}/selector_llext)