diff --git a/app/overlays/ptl/dts_overlay.conf b/app/overlays/ptl/dts_overlay.conf index 793559ad5de7..00c0dc49250a 100644 --- a/app/overlays/ptl/dts_overlay.conf +++ b/app/overlays/ptl/dts_overlay.conf @@ -1,6 +1,9 @@ CONFIG_COMP_IIR=m CONFIG_COMP_MODULE_ADAPTER=y CONFIG_DTS_CODEC=y +CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING=y +CONFIG_MINIMAL_LIBC=n +CONFIG_PICOLIBC=y CONFIG_LLEXT_HEAP_SIZE=64 CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n CONFIG_SOF_STACK_SIZE=8192 diff --git a/src/audio/google/CMakeLists.txt b/src/audio/google/CMakeLists.txt index fa55c9f39a2e..b37db1bf58e4 100644 --- a/src/audio/google/CMakeLists.txt +++ b/src/audio/google/CMakeLists.txt @@ -3,7 +3,7 @@ is_zephyr(zephyr) if(zephyr) ### Zephyr ### - set(THIRD_PARTY ${SOF_ROOT_SOURCE_DIRECTORY}/third_party) + set(THIRD_PARTY ${sof_top_dir}/third_party) if(CONFIG_IPC_MAJOR_3) set(ipc_suffix ipc3) elseif(CONFIG_IPC_MAJOR_4) @@ -29,8 +29,8 @@ if(zephyr) ### Zephyr ### 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 stdc++) + target_link_libraries(SOF INTERFACE supc++) target_link_libraries(SOF INTERFACE m) target_link_libraries(SOF INTERFACE c) target_link_libraries(SOF INTERFACE gcc) @@ -54,8 +54,8 @@ if(zephyr) ### Zephyr ### 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 stdc++) + target_link_libraries(SOF INTERFACE supc++) target_link_libraries(SOF INTERFACE m) target_link_libraries(SOF INTERFACE c) target_link_libraries(SOF INTERFACE gcc) diff --git a/src/audio/module_adapter/module_adapter_ipc4.c b/src/audio/module_adapter/module_adapter_ipc4.c index cdf535b1661e..266af61ff263 100644 --- a/src/audio/module_adapter/module_adapter_ipc4.c +++ b/src/audio/module_adapter/module_adapter_ipc4.c @@ -132,8 +132,14 @@ int module_adapter_init_data(struct comp_dev *dev, if (cfg == NULL) return -EINVAL; - if (cfgsz < sizeof(cfg->base_cfg)) - return -EINVAL; + if (cfgsz < sizeof(cfg->base_cfg)) { + memset(&dst->base_cfg, 0, sizeof(dst->base_cfg)); + if (cfgsz > 0 && cfg) + memcpy(&dst->base_cfg, cfg, cfgsz); + dst->size = cfgsz; + dst->avail = true; + return 0; + } dst->base_cfg = cfg->base_cfg; dst->size = cfgsz; diff --git a/tools/rimage/config/ptl.toml.h b/tools/rimage/config/ptl.toml.h index e622c8af968e..45b5b2626fb3 100644 --- a/tools/rimage/config/ptl.toml.h +++ b/tools/rimage/config/ptl.toml.h @@ -174,5 +174,9 @@ index = __COUNTER__ #include