diff --git a/src/audio/CMakeLists.txt b/src/audio/CMakeLists.txt index 85f3216d4c0f..53626f45419d 100644 --- a/src/audio/CMakeLists.txt +++ b/src/audio/CMakeLists.txt @@ -46,6 +46,9 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD) if(CONFIG_COMP_FIR) add_subdirectory(eq_fir) endif() + if(CONFIG_COMP_IGO_NR) + add_subdirectory(igo_nr) + endif() if(CONFIG_COMP_IIR) add_subdirectory(eq_iir) endif() @@ -63,15 +66,24 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD) if(CONFIG_COMP_MIXIN_MIXOUT) add_subdirectory(mixin_mixout) endif() + if(CONFIG_COMP_MODULE_ADAPTER) + add_subdirectory(module_adapter) + endif() if(CONFIG_COMP_MULTIBAND_DRC) add_subdirectory(multiband_drc) endif() if(CONFIG_COMP_MUX) add_subdirectory(mux) endif() + if(CONFIG_COMP_RTNR) + add_subdirectory(rtnr) + endif() if(CONFIG_COMP_SEL) add_subdirectory(selector) endif() + if(CONFIG_COMP_SMART_AMP) + add_subdirectory(smart_amp) + endif() if(CONFIG_COMP_SRC) add_subdirectory(src) endif() @@ -89,6 +101,13 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD) if(CONFIG_COMP_VOLUME) add_subdirectory(volume) endif() + if(CONFIG_DTS_CODEC) + add_subdirectory(codec) + endif() + add_subdirectory(google) + if(CONFIG_INTEL_ADSP_MIC_PRIVACY) + add_subdirectory(mic_privacy_manager) + endif() if(CONFIG_ZEPHYR_NATIVE_DRIVERS) list(APPEND base_files host-zephyr.c) sof_list_append_ifdef(CONFIG_COMP_DAI base_files dai-zephyr.c) @@ -127,25 +146,6 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD) dai-legacy.c ) endif() - if(CONFIG_COMP_SMART_AMP) - add_subdirectory(smart_amp) - endif() - if(CONFIG_COMP_MODULE_ADAPTER) - add_subdirectory(module_adapter) - endif() - if(CONFIG_COMP_IGO_NR) - add_subdirectory(igo_nr) - endif() - if(CONFIG_COMP_RTNR) - add_subdirectory(rtnr) - endif() - if(CONFIG_INTEL_ADSP_MIC_PRIVACY) - add_subdirectory(mic_privacy_manager) - endif() - add_subdirectory(google) - if(CONFIG_DTS_CODEC) - add_subdirectory(codec) - endif() return() endif() diff --git a/src/audio/codec/CMakeLists.txt b/src/audio/codec/CMakeLists.txt index 0d14dbd98221..bdef3031ceb5 100644 --- a/src/audio/codec/CMakeLists.txt +++ b/src/audio/codec/CMakeLists.txt @@ -1,13 +1,36 @@ # SPDX-License-Identifier: BSD-3-Clause +is_zephyr(zephyr) +if(zephyr) ### Zephyr ### + + if(CONFIG_DTS_CODEC STREQUAL "m") + add_subdirectory(dts/llext ${PROJECT_BINARY_DIR}/dts_llext) + add_dependencies(app dts) + + else(CONFIG_DTS_CODEC) + zephyr_library_sources(dts/dts.c) + if (CONFIG_DTS_CODEC_STUB) + zephyr_library_sources(dts/dts_stub.c) + else() + zephyr_library_import(DtsCodec + ${sof_top_dir}/third_party/lib/libdts-sof-interface-i32.a) + endif() + endif() + + return() +endif() + +### XTOS ### if(CONFIG_DTS_CODEC) - add_local_sources(sof dts/dts.c) - target_compile_definitions(sof PRIVATE -DDTS_MATH_INT32 -DDTS_XTENSA) - if (CONFIG_DTS_CODEC_STUB) - add_local_sources(sof dts/dts_stub.c) - else() - sof_add_static_library(DtsCodec - ${SOF_ROOT_SOURCE_DIRECTORY}/third_party/lib/libdts-sof-interface-i32.a) - target_include_directories(sof PRIVATE ${CMAKE_SOURCE_DIR}/third_party/include) - endif() + add_local_sources(sof dts/dts.c) + target_compile_definitions(sof PRIVATE -DDTS_MATH_INT32 -DDTS_XTENSA) + + if (CONFIG_DTS_CODEC_STUB) + add_local_sources(sof dts/dts_stub.c) + else() + sof_add_static_library(DtsCodec + ${SOF_ROOT_SOURCE_DIRECTORY}/third_party/lib/libdts-sof-interface-i32.a) + target_include_directories(sof PRIVATE ${CMAKE_SOURCE_DIR}/third_party/include) + endif() + endif() diff --git a/src/audio/google/CMakeLists.txt b/src/audio/google/CMakeLists.txt index a53374e3a95a..d4d89ec8778a 100644 --- a/src/audio/google/CMakeLists.txt +++ b/src/audio/google/CMakeLists.txt @@ -1,5 +1,71 @@ # SPDX-License-Identifier: BSD-3-Clause +is_zephyr(zephyr) +if(zephyr) ### Zephyr ### + + set(THIRD_PARTY ${SOF_ROOT_SOURCE_DIRECTORY}/third_party) + if(CONFIG_IPC_MAJOR_3) + set(ipc_suffix ipc3) + elseif(CONFIG_IPC_MAJOR_4) + set(ipc_suffix ipc4) + endif() + + zephyr_library_sources_ifdef(CONFIG_COMP_GOOGLE_HOTWORD_DETECT + google_hotword_detect.c + ) + + if(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING STREQUAL "m") + add_subdirectory(llext_rtc + ${PROJECT_BINARY_DIR}/google_rtc_audio_processing_llext) + add_dependencies(app google_rtc_audio_processing) + elseif(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING) + zephyr_library_sources(google_rtc_audio_processing.c) + + zephyr_library_sources_ifdef(CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK + google_rtc_audio_processing_mock.c + ) + + if(NOT CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK) + zephyr_include_directories(${THIRD_PARTY}/include) + target_link_directories(SOF INTERFACE ${THIRD_PARTY}/lib) + target_link_libraries(SOF INTERFACE google_rtc_audio_processing) + target_link_libraries(SOF INTERFACE c++) + target_link_libraries(SOF INTERFACE c++abi) + target_link_libraries(SOF INTERFACE m) + target_link_libraries(SOF INTERFACE c) + target_link_libraries(SOF INTERFACE gcc) + endif() + endif() + + if(CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING STREQUAL "m") + add_subdirectory(llext_ctc + ${PROJECT_BINARY_DIR}/google_ctc_audio_processing_llext) + add_dependencies(app google_ctc_audio_processing) + elseif(CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING) + zephyr_library_sources( + google_ctc_audio_processing.c + google_ctc_audio_processing_${ipc_suffix}.c + ) + zephyr_library_sources_ifdef(CONFIG_GOOGLE_CTC_AUDIO_PROCESSING_MOCK + google_ctc_audio_processing_mock.c + ) + + if(NOT CONFIG_GOOGLE_CTC_AUDIO_PROCESSING_MOCK) + zephyr_include_directories(${THIRD_PARTY}/include) + target_link_directories(SOF INTERFACE ${THIRD_PARTY}/lib) + target_link_libraries(SOF INTERFACE google_ctc_audio_processing) + target_link_libraries(SOF INTERFACE c++) + target_link_libraries(SOF INTERFACE c++abi) + target_link_libraries(SOF INTERFACE m) + target_link_libraries(SOF INTERFACE c) + target_link_libraries(SOF INTERFACE gcc) + endif() + endif() + + return() +endif() + +### XTOS build rules ### if((NOT CONFIG_LIBRARY) OR CONFIG_LIBRARY_STATIC) if(CONFIG_COMP_GOOGLE_HOTWORD_DETECT) add_local_sources(sof diff --git a/src/audio/igo_nr/CMakeLists.txt b/src/audio/igo_nr/CMakeLists.txt index 49f9af9a2003..8ee1709ff5d6 100644 --- a/src/audio/igo_nr/CMakeLists.txt +++ b/src/audio/igo_nr/CMakeLists.txt @@ -1,8 +1,22 @@ # SPDX-License-Identifier: BSD-3-Clause +if(CONFIG_COMP_IGO_NR STREQUAL "m") + add_subdirectory(llext ${PROJECT_BINARY_DIR}/igo_nr_llext) + add_dependencies(app igo_nr) + return() +endif() + add_local_sources(sof igo_nr.c) + if (CONFIG_COMP_IGO_NR_STUB) -add_local_sources(sof igo_nr_stub.c) -else () -sof_add_static_library(IGOChrome ${CMAKE_CURRENT_LIST_DIR}/libigonr.a) -endif () + add_local_sources(sof igo_nr_stub.c) + +else() + is_zephyr(zephyr) + if(zephyr) ### Zephyr ### + zephyr_library_import(IGOChrome ${CMAKE_CURRENT_LIST_DIR}/libigonr.a) + else() + sof_add_static_library(IGOChrome ${CMAKE_CURRENT_LIST_DIR}/libigonr.a) + endif() + +endif() diff --git a/src/audio/module_adapter/CMakeLists.txt b/src/audio/module_adapter/CMakeLists.txt index 300296dc6205..4b0801404bc4 100644 --- a/src/audio/module_adapter/CMakeLists.txt +++ b/src/audio/module_adapter/CMakeLists.txt @@ -1,12 +1,68 @@ # SPDX-License-Identifier: BSD-3-Clause - if(CONFIG_IPC_MAJOR_3) add_local_sources(sof module_adapter.c module_adapter_ipc3.c module/generic.c) elseif(CONFIG_IPC_MAJOR_4) add_local_sources(sof module_adapter.c module_adapter_ipc4.c module/generic.c) endif() +is_zephyr(zephyr) +if(zephyr) ### Zephyr ### + + # modules and codecs in alphabetical order + + zephyr_library_sources_ifdef(CONFIG_CADENCE_CODEC module/cadence.c) + + if (CONFIG_CADENCE_CODEC_AAC_DEC) + zephyr_library_import(xa_aac_dec ${CONFIG_CADENCE_CODEC_AAC_DEC_LIB}) + endif() + + if (CONFIG_CADENCE_CODEC_MP3_DEC) + zephyr_library_import(xa_mp3_dec ${CONFIG_CADENCE_CODEC_MP3_DEC_LIB}) + endif() + + if (CONFIG_CADENCE_CODEC_MP3_ENC) + zephyr_library_import(xa_mp3_enc ${CONFIG_CADENCE_CODEC_MP3_ENC_LIB}) + endif() + + zephyr_include_directories_ifdef(CONFIG_INTEL_MODULES + ${SOF_SRC_PATH}/include/sof/audio/module_adapter/iadk/ + ${SOF_SRC_PATH}/include/sof/audio/module_adapter/library/ + ) + + zephyr_library_sources_ifdef(CONFIG_INTEL_MODULES + module/modules.c + iadk/module_initial_settings_concrete.cpp + iadk/iadk_module_adapter.cpp + iadk/system_agent.cpp + library/native_system_agent.c + library/native_system_service.c + ) + + zephyr_library_sources_ifdef(CONFIG_PASSTHROUGH_CODEC + module/passthrough.c + ) + + if(CONFIG_WAVES_CODEC) + set(WAVES_DIR module/waves) + if(CONFIG_WAVES_CODEC STREQUAL "m") + add_subdirectory(${WAVES_DIR}/llext ${PROJECT_BINARY_DIR}/waves_llext) + add_dependencies(app waves) + else() + zephyr_library_sources(${WAVES_DIR}/waves.c) + if(CONFIG_WAVES_CODEC_STUB) + zephyr_library_sources_ifdef(CONFIG_WAVES_CODEC_STUB + ${WAVES_DIR}/maxx_stub.c) + else() + zephyr_library_import(waves_codec + ${sof_top_dir}/third_party/lib/libMaxxChrome.a) + endif() + endif() + endif() + + return() +endif() + if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD) if(CONFIG_CADENCE_CODEC) add_local_sources(sof module/cadence.c) diff --git a/src/audio/rtnr/CMakeLists.txt b/src/audio/rtnr/CMakeLists.txt index dc396d5d9035..034bd339a9ae 100644 --- a/src/audio/rtnr/CMakeLists.txt +++ b/src/audio/rtnr/CMakeLists.txt @@ -1,11 +1,26 @@ # SPDX-License-Identifier: BSD-3-Clause -add_local_sources(sof rtnr.c) - -if (CONFIG_COMP_RTNR_STUB) - add_local_sources(sof rtnr_stub.c) -elseif(CONFIG_TIGERLAKE) - add_subdirectory(rtklib/tgl) -elseif(CONFIG_MT8195) - add_subdirectory(rtklib/mt8195) +if(CONFIG_COMP_RTNR STREQUAL "m") + add_subdirectory(llext ${PROJECT_BINARY_DIR}/rtnr_llext) + add_dependencies(app rtnr) + return() +endif() + +is_zephyr(zephyr) +if(zephyr) ### Zephyr ### + + zephyr_library_sources(rtnr.c) + zephyr_library_sources_ifdef(CONFIG_COMP_RTNR_STUB rtnr_stub.c) + +else() ### XTOS ### + + add_local_sources(sof rtnr.c) + if (CONFIG_COMP_RTNR_STUB) + add_local_sources(sof rtnr_stub.c) + elseif(CONFIG_TIGERLAKE) + add_subdirectory(rtklib/tgl) + elseif(CONFIG_MT8195) + add_subdirectory(rtklib/mt8195) + endif() + endif() diff --git a/src/audio/smart_amp/CMakeLists.txt b/src/audio/smart_amp/CMakeLists.txt index 387381057804..22d23b2820f9 100644 --- a/src/audio/smart_amp/CMakeLists.txt +++ b/src/audio/smart_amp/CMakeLists.txt @@ -3,13 +3,33 @@ add_local_sources(sof smart_amp.c smart_amp_generic.c) if(CONFIG_MAXIM_DSM) -add_local_sources(sof smart_amp_maxim_dsm.c) -if(CONFIG_MAXIM_DSM_STUB) -add_local_sources(sof maxim_dsm_stub.c) + add_local_sources(sof smart_amp_maxim_dsm.c) + if(CONFIG_MAXIM_DSM_STUB) + add_local_sources(sof maxim_dsm_stub.c) + endif() else() -sof_add_static_library(dsm ${CMAKE_CURRENT_LIST_DIR}/lib/release/dsm_lib/libdsm.a) + add_local_sources(sof smart_amp_passthru.c) endif() -target_include_directories(sof PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include/dsm_api/inc) -else() -add_local_sources(sof smart_amp_passthru.c) + +is_zephyr(zephyr) +if(zephyr) ### Zephyr ### + + if(CONFIG_MAXIM_DSM) + if(NOT CONFIG_MAXIM_DSM_STUB) + zephyr_library_import(dsm ${CMAKE_CURRENT_LIST_DIR}/lib/release/dsm_lib/libdsm.a) + endif() + + zephyr_include_directories(CONFIG_MAXIM_DSM ${CMAKE_CURRENT_LIST_DIR}/include/dsm_api/inc/) + endif() + +else() ### XTOS + + if(CONFIG_MAXIM_DSM) + if(NOT CONFIG_MAXIM_DSM_STUB) + sof_add_static_library(dsm ${CMAKE_CURRENT_LIST_DIR}/lib/release/dsm_lib/libdsm.a) + endif() + + target_include_directories(sof PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include/dsm_api/inc) + endif() + endif() diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index a9ae9f1e0c92..9f485cdae8c0 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -134,8 +134,6 @@ cmake_path(SET sof_top_dir NORMALIZE "${CMAKE_CURRENT_SOURCE_DIR}/..") set(SOF_SRC_PATH "${sof_top_dir}/src") set(SOF_PLATFORM_PATH "${SOF_SRC_PATH}/platform") -set(SOF_AUDIO_PATH "${SOF_SRC_PATH}/audio") -set(SOF_AUDIO_MODULES_PATH "${SOF_SRC_PATH}/audio/module_adapter/module") set(SOF_SAMPLES_PATH "${SOF_SRC_PATH}/samples") set(SOF_LIB_PATH "${SOF_SRC_PATH}/lib") set(SOF_DRIVERS_PATH "${SOF_SRC_PATH}/drivers") @@ -514,12 +512,6 @@ zephyr_library_sources_ifdef(CONFIG_SAMPLE_KEYPHRASE ${SOF_SAMPLES_PATH}/audio/detect_test.c ) -zephyr_library_sources_ifdef(CONFIG_COMP_MODULE_ADAPTER - ${SOF_AUDIO_PATH}/module_adapter/module_adapter.c - ${SOF_AUDIO_PATH}/module_adapter/module_adapter_${ipc_suffix}.c - ${SOF_AUDIO_PATH}/module_adapter/module/generic.c -) - zephyr_library_sources_ifdef(CONFIG_LIBRARY_MANAGER ${SOF_SRC_PATH}/library_manager/lib_manager.c ${SOF_SRC_PATH}/library_manager/lib_notification.c @@ -531,135 +523,6 @@ zephyr_library_sources_ifdef(CONFIG_LIBRARY_MANAGER ) endif() -zephyr_include_directories_ifdef(CONFIG_INTEL_MODULES - ${SOF_SRC_PATH}/include/sof/audio/module_adapter/iadk/ - ${SOF_SRC_PATH}/include/sof/audio/module_adapter/library/ -) - -zephyr_library_sources_ifdef(CONFIG_INTEL_MODULES - ${SOF_AUDIO_PATH}/module_adapter/module/modules.c - ${SOF_AUDIO_PATH}/module_adapter/iadk/module_initial_settings_concrete.cpp - ${SOF_AUDIO_PATH}/module_adapter/iadk/iadk_module_adapter.cpp - ${SOF_AUDIO_PATH}/module_adapter/iadk/system_agent.cpp - ${SOF_AUDIO_PATH}/module_adapter/library/native_system_agent.c - ${SOF_AUDIO_PATH}/module_adapter/library/native_system_service.c -) - -if (CONFIG_COMP_MODULE_ADAPTER) -zephyr_library_sources_ifdef(CONFIG_CADENCE_CODEC - ${SOF_AUDIO_PATH}/module_adapter/module/cadence.c -) - -if (CONFIG_CADENCE_CODEC_MP3_DEC) -zephyr_library_import(xa_mp3_dec ${CONFIG_CADENCE_CODEC_MP3_DEC_LIB}) -endif() - -if (CONFIG_CADENCE_CODEC_MP3_ENC) -zephyr_library_import(xa_mp3_enc ${CONFIG_CADENCE_CODEC_MP3_ENC_LIB}) -endif() - -if (CONFIG_CADENCE_CODEC_AAC_DEC) -zephyr_library_import(xa_aac_dec ${CONFIG_CADENCE_CODEC_AAC_DEC_LIB}) -endif() - -zephyr_library_sources_ifdef(CONFIG_PASSTHROUGH_CODEC - ${SOF_AUDIO_MODULES_PATH}/passthrough.c -) -endif() - -zephyr_library_sources_ifdef(CONFIG_MAXIM_DSM - ${SOF_AUDIO_PATH}/smart_amp/smart_amp.c - ${SOF_AUDIO_PATH}/smart_amp/smart_amp_generic.c - ${SOF_AUDIO_PATH}/smart_amp/smart_amp_maxim_dsm.c -) - -zephyr_include_directories_ifdef(CONFIG_MAXIM_DSM - ${SOF_AUDIO_PATH}/smart_amp/include/dsm_api/inc/ -) - -zephyr_library_sources_ifdef(CONFIG_MAXIM_DSM_STUB - ${SOF_AUDIO_PATH}/smart_amp/maxim_dsm_stub.c -) - -if(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING STREQUAL "m") - add_subdirectory(${SOF_AUDIO_PATH}/google/llext_rtc - ${PROJECT_BINARY_DIR}/google_rtc_audio_processing_llext) - add_dependencies(app google_rtc_audio_processing) -elseif(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING) - zephyr_library_sources( - ${SOF_AUDIO_PATH}/google/google_rtc_audio_processing.c - ) - - zephyr_library_sources_ifdef(CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK - ${SOF_AUDIO_PATH}/google/google_rtc_audio_processing_mock.c - ) - - if(NOT CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK) - zephyr_include_directories(../third_party/include) - target_link_directories(SOF INTERFACE ../third_party/lib) - target_link_libraries(SOF INTERFACE google_rtc_audio_processing) - target_link_libraries(SOF INTERFACE c++) - target_link_libraries(SOF INTERFACE c++abi) - target_link_libraries(SOF INTERFACE m) - target_link_libraries(SOF INTERFACE c) - target_link_libraries(SOF INTERFACE gcc) - endif() -endif() - -if(CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING STREQUAL "m") - add_subdirectory(${SOF_AUDIO_PATH}/google/llext_ctc - ${PROJECT_BINARY_DIR}/google_ctc_audio_processing_llext) - add_dependencies(app google_ctc_audio_processing) -elseif(CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING) - zephyr_library_sources( - ${SOF_AUDIO_PATH}/google/google_ctc_audio_processing.c - ${SOF_AUDIO_PATH}/google/google_ctc_audio_processing_${ipc_suffix}.c - ) - - zephyr_library_sources_ifdef(CONFIG_GOOGLE_CTC_AUDIO_PROCESSING_MOCK - ${SOF_AUDIO_PATH}/google/google_ctc_audio_processing_mock.c - ) - - if(NOT CONFIG_GOOGLE_CTC_AUDIO_PROCESSING_MOCK) - zephyr_include_directories(../third_party/include) - target_link_directories(SOF INTERFACE ../third_party/lib) - target_link_libraries(SOF INTERFACE google_ctc_audio_processing) - target_link_libraries(SOF INTERFACE c++) - target_link_libraries(SOF INTERFACE c++abi) - target_link_libraries(SOF INTERFACE m) - target_link_libraries(SOF INTERFACE c) - target_link_libraries(SOF INTERFACE gcc) - endif() -endif() - -if(CONFIG_COMP_IGO_NR STREQUAL "m") - add_subdirectory(${SOF_AUDIO_PATH}/igo_nr/llext - ${PROJECT_BINARY_DIR}/igo_nr_llext) - add_dependencies(app igo_nr) -elseif(CONFIG_COMP_IGO_NR) - zephyr_library_sources( - ${SOF_AUDIO_PATH}/igo_nr/igo_nr.c - ) - - zephyr_library_sources_ifdef(CONFIG_COMP_IGO_NR_STUB - ${SOF_AUDIO_PATH}/igo_nr/igo_nr_stub.c - ) -endif() - -if(CONFIG_COMP_RTNR STREQUAL "m") - add_subdirectory(${SOF_AUDIO_PATH}/rtnr/llext - ${PROJECT_BINARY_DIR}/rtnr_llext) - add_dependencies(app rtnr) -elseif(CONFIG_COMP_RTNR) - zephyr_library_sources( - ${SOF_AUDIO_PATH}/rtnr/rtnr.c - ) - - zephyr_library_sources_ifdef(CONFIG_COMP_RTNR_STUB - ${SOF_AUDIO_PATH}/rtnr/rtnr_stub.c - ) -endif() - if(CONFIG_SAMPLE_SMART_AMP STREQUAL "m") add_subdirectory(${SOF_SAMPLES_PATH}/audio/smart_amp_test_llext ${PROJECT_BINARY_DIR}/smart_amp_test_llext) @@ -670,45 +533,6 @@ elseif(CONFIG_SAMPLE_SMART_AMP) ) endif() -zephyr_library_sources_ifdef(CONFIG_COMP_GOOGLE_HOTWORD_DETECT - ${SOF_AUDIO_PATH}/google/google_hotword_detect.c -) - -if(CONFIG_DTS_CODEC STREQUAL "m") - add_subdirectory(${SOF_AUDIO_PATH}/codec/dts/llext - ${PROJECT_BINARY_DIR}/dts_llext) - add_dependencies(app dts) -elseif(CONFIG_DTS_CODEC) - zephyr_library_sources( - ${SOF_AUDIO_PATH}/codec/dts/dts.c - ) - if (CONFIG_DTS_CODEC_STUB) - zephyr_library_sources( - ${SOF_AUDIO_PATH}/codec/dts/dts_stub.c - ) - else() - zephyr_library_import(DtsCodec - ${sof_top_dir}/third_party/lib/libdts-sof-interface-i32.a) - endif() -endif() - -if(CONFIG_WAVES_CODEC) - set(WAVES_DIR ${SOF_AUDIO_PATH}/module_adapter/module/waves) - if(CONFIG_WAVES_CODEC STREQUAL "m") - add_subdirectory(${WAVES_DIR}/llext ${PROJECT_BINARY_DIR}/waves_llext) - add_dependencies(app waves) - else() - zephyr_library_sources(${WAVES_DIR}/waves.c) - if(CONFIG_WAVES_CODEC_STUB) - zephyr_library_sources_ifdef(CONFIG_WAVES_CODEC_STUB - ${WAVES_DIR}/maxx_stub.c) - else() - zephyr_library_import(waves_codec - ${sof_top_dir}/third_party/lib/libMaxxChrome.a) - endif() - endif() -endif() - if(CONFIG_PROBE STREQUAL "m") add_subdirectory(${SOF_SRC_PATH}/probe/llext ${PROJECT_BINARY_DIR}/probe_llext) @@ -746,10 +570,6 @@ zephyr_library_sources_ifdef(CONFIG_SHELL sof_shell.c ) -zephyr_library_sources_ifdef(CONFIG_INTEL_ADSP_MIC_PRIVACY - ${SOF_AUDIO_PATH}/mic_privacy_manager/mic_privacy_manager_intel.c -) - zephyr_library_link_libraries(SOF) target_link_libraries(SOF INTERFACE zephyr_interface)