From b2f79a0c3df855222e6b61044a320c4936d5008b Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Sat, 24 Aug 2024 00:02:21 +0000 Subject: [PATCH] intel_adsp_ace15_mtpm.conf: replace blanket _STUBS with focused RTC MOCK CONFIG_COMP_STUBS=y was enabled in #8722 / commit 8e34109e105a ("AEC: Enable Google AEC with Mock compliation"). CONFIG_COMP_STUBS indirectly enables CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK which was the desired effect. However it also automatically and silently "mocks" all other 3rd party modules which is not desirable. So, replace it with the more focused `CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK`. `src/audio/Kconfig` says "CONFIG_STUBS: This should only be used in testing environments like fuzzers or CI." Official sof-bin releases include `google_rtc_audio_processing_mock.c` because the CI that uses it can't use extra CONFIGS. That's another topic for another day, see #9410. build-mtl/zephyr.strip is identical before versus after this commit. Signed-off-by: Marc Herbert --- app/boards/intel_adsp_ace15_mtpm.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index 293ffe747e82..e3d36ba7c35c 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/app/boards/intel_adsp_ace15_mtpm.conf @@ -104,7 +104,9 @@ CONFIG_PROBE=y CONFIG_PROBE_DMA_MAX=2 CONFIG_LOG_TIMESTAMP_64BIT=y +# This mock is part of official sof-bin releases because the CI that +# tests it can't use extra CONFIGs. See #9410, #8722 and #9386 CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=y -CONFIG_COMP_STUBS=y +CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=y