From f9758178893787f29e79d689ed7759fd871d5270 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Thu, 21 Aug 2025 15:19:02 +0300 Subject: [PATCH 1/2] audio: remove unnecessary Kconfig defaults Remove unnecessary 'n' defaults in audio modules. This doesn't affect any current build as 'n' is the default if not set otherwise. By removing the unconditional defaults, it becomes possible to set defaults later in board/family specific Kconfig.defconfig files. Signed-off-by: Kai Vehmanen --- app/Kconfig | 1 - src/audio/Kconfig | 18 ------------------ src/audio/aria/Kconfig | 1 - src/audio/asrc/Kconfig | 10 ---------- src/audio/codec/Kconfig | 2 -- src/audio/crossover/Kconfig | 1 - src/audio/drc/Kconfig | 1 - src/audio/google/Kconfig | 3 --- src/audio/igo_nr/Kconfig | 2 -- src/audio/module_adapter/Kconfig | 15 --------------- src/audio/multiband_drc/Kconfig | 1 - src/audio/nxp/Kconfig | 2 -- src/audio/rtnr/Kconfig | 2 -- src/audio/smart_amp/Kconfig | 2 -- src/audio/tensorflow/Kconfig | 1 - src/audio/up_down_mixer/Kconfig | 1 - 16 files changed, 63 deletions(-) diff --git a/app/Kconfig b/app/Kconfig index 1ea5b4d46f61..0e35e8916398 100644 --- a/app/Kconfig +++ b/app/Kconfig @@ -5,4 +5,3 @@ config SMP_BOOT_DELAY default y if SMP source "Kconfig.zephyr" - diff --git a/src/audio/Kconfig b/src/audio/Kconfig index 62dc9938b92b..005c618cf9a5 100644 --- a/src/audio/Kconfig +++ b/src/audio/Kconfig @@ -41,7 +41,6 @@ config HOST_DMA_RELOAD_THRESHOLD config HOST_DMA_STREAM_SYNCHRONIZATION bool "Stream DMA Transfers Synchronization" default y if ACE - default n help Enable synchronized Firmware Pointer Increment (FPI) register updates of HD-A gateways belonging to a group defined by the driver. The driver may also specify an update period @@ -50,7 +49,6 @@ config HOST_DMA_STREAM_SYNCHRONIZATION config COMP_CHAIN_DMA bool "Chain DMA component" - default n depends on IPC_MAJOR_4 depends on DMA_INTEL_ADSP_HDA help @@ -100,7 +98,6 @@ rsource "src/Kconfig" config COMP_STUBS bool "Build all selected third-party (3P) components with stubs" - default n help Select to force all 3P blocks to link against stubs rather than their libraries. This should only be used in testing environments like fuzzers or CI. @@ -111,7 +108,6 @@ rsource "eq_iir/Kconfig" config COMP_TONE bool "Tone component" - default n select CORDIC_FIXED help Select for Tone component. @@ -190,7 +186,6 @@ menu "Data formats" config FORMAT_U8 bool "Support U8" - default n help Support unsigned 8 bit processing data format @@ -218,7 +213,6 @@ config FORMAT_S24LE config FORMAT_S24_3LE bool "Support S24_3LE" - default n help Support packed 24 bit processing data format with sign and in little endian format @@ -248,7 +242,6 @@ config FORMAT_CONVERT_HIFI3 config PCM_CONVERTER_FORMAT_U8 bool "Support U8" - default n help Support 8 bit processing data format without sign @@ -284,7 +277,6 @@ config PCM_CONVERTER_FORMAT_S24_4LE_MSB config PCM_CONVERTER_FORMAT_S24_3LE bool "Support S24_3LE" - default n help Support packed 24 bit processing data format with sign and in little endian format @@ -309,42 +301,36 @@ config PCM_CONVERTER_FORMAT_FLOAT config PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32 bool "Support S16C16 <-> S16C32" - default n help Support conversion between 16 bit valid sample size in 16 bit container and 16 bit valid sample size in 32 bit container config PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32 bool "Support S16C32 <-> S32C32" - default n help Support conversion between 16 bit valid sample size in 32 bit container and 32 bit valid sample size in 32 bit container config PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32 bool "Support S16C32 <-> S24C32" - default n help Support conversion between 16 bit valid sample size in 32 bit container and 24 bit valid sample size in 32 bit container config PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32 bool "Support S24C24 <-> S24C32" - default n help Support conversion between 24 bit valid sample size in 24 bit container and 24 bit valid sample size in 32 bit container config PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24 bool "Support S24C32 <-> S24C24" - default n help Support conversion between 24 bit valid sample size in 32 bit container and 24 bit valid sample size in 24 bit container config PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32 bool "Support S16C32 <-> S16C32" - default n help Support one-to-one copying conversion for 16 bit valid sample size in 32 bit container @@ -373,7 +359,6 @@ config TRACE_CHANNEL config WRAP_ACTUAL_POSITION bool "Buffer wrapping" - default n help This option is to update the actual position information on wrap of buffer. It is not necessary that on wrap, the buffer position would be zero.At wrap, @@ -382,20 +367,17 @@ config WRAP_ACTUAL_POSITION config COMP_MODULE_SHARED_LIBRARY_BUILD bool "Build SOF modules as shared libraries" - default n help Select if you want to build modules as shared objects that can be used to run pipelines on the host with the testbench or the ALSA plugin. config DISABLE_DESCRIPTOR_SPLIT bool "Disable descriptor split" - default n help This option disbale the descriptor split for host p-table. config DAI_VERBOSE_GLITCH_WARNINGS bool "Enable additional checks and warnings for DAI data flow" - default n help Select if you want to enable additional checks and warning logs for DAI data flow. If DAI copy is called with no data to process, diff --git a/src/audio/aria/Kconfig b/src/audio/aria/Kconfig index 8e0f448cc167..51b9cfa3381d 100644 --- a/src/audio/aria/Kconfig +++ b/src/audio/aria/Kconfig @@ -3,7 +3,6 @@ config COMP_ARIA tristate "ARIA component" default m if LIBRARY_DEFAULT_MODULAR - default n depends on IPC_MAJOR_4 help Select for Automatic Regressive Input Amplifier Module component diff --git a/src/audio/asrc/Kconfig b/src/audio/asrc/Kconfig index b9b8604e667e..1ee458363c75 100644 --- a/src/audio/asrc/Kconfig +++ b/src/audio/asrc/Kconfig @@ -64,70 +64,60 @@ menu "Supported downsampling conversions" config ASRC_SUPPORT_CONVERSION_24000_TO_08000 bool "Downsample 24 kHz to 8 kHz" - default n help This option enables downsampling from 24 kHz to 8 kHz into the build. The consumption of memory is 2.1 kB. config ASRC_SUPPORT_CONVERSION_24000_TO_16000 bool "Downsample 24 kHz to 16 kHz" - default n help This option enables downsampling from 24 kHz to 16 kHz into the build. The consumption of memory is 1.9 kB. config ASRC_SUPPORT_CONVERSION_48000_TO_08000 bool "Downsample 48 kHz to 8 kHz" - default n help This option enables downsampling from 48 kHz to 8 kHz into the build. The consumption of memory is 2.1 kB. config ASRC_SUPPORT_CONVERSION_48000_TO_11025 bool "Downsample 48 kHz to 11.025 kHz" - default n help This option enables downsampling from 48 kHz to 11.025 kHz into the build. The consumption of memory is 1.5 kB. config ASRC_SUPPORT_CONVERSION_48000_TO_12000 bool "Downsample 48 kHz to 12 kHz" - default n help This option enables downsampling from 48 kHz to 12 kHz into the build. The consumption of memory is 1.5 kB. config ASRC_SUPPORT_CONVERSION_48000_TO_16000 bool "Downsample 48 kHz to 16 kHz" - default n help This option enables downsampling from 48 kHz to 16 kHz into the build. The consumption of memory is 1.9 kB. config ASRC_SUPPORT_CONVERSION_48000_TO_22050 bool "Downsample 48 kHz to 22.05 kHz" - default n help This option enables downsampling from 48 kHz to 22.05 kHz into the build. The consumption of memory is 1.6 kB. config ASRC_SUPPORT_CONVERSION_48000_TO_24000 bool "Downsample 48 kHz to 24 kHz" - default n help This option enables downsampling from 48 kHz to 24 kHz into the build. The consumption of memory is 1.6 kB. config ASRC_SUPPORT_CONVERSION_48000_TO_32000 bool "Downsample 48 kHz to 32 kHz" - default n help This option enables downsampling from 48 kHz to 32 kHz into the build. The consumption of memory is 1.9 kB. config ASRC_SUPPORT_CONVERSION_48000_TO_44100 bool "Downsample 48 kHz to 44.1 kHz" - default n help This option enables downsampling from 48 kHz to 44.1 kHz into the build. The consumption of memory is 1.8 kB. diff --git a/src/audio/codec/Kconfig b/src/audio/codec/Kconfig index 59eaef67e1b7..0f089e3a7c54 100644 --- a/src/audio/codec/Kconfig +++ b/src/audio/codec/Kconfig @@ -2,7 +2,6 @@ config DTS_CODEC tristate "DTS codec" - default n select DTS_CODEC_STUB if COMP_STUBS help Select to include DTS codec. @@ -14,7 +13,6 @@ config DTS_CODEC config DTS_CODEC_STUB bool "DTS codec stub" depends on DTS_CODEC - default n help Select to include DTS codec stub library. This is meant for testing and CI purposes only. diff --git a/src/audio/crossover/Kconfig b/src/audio/crossover/Kconfig index 524028e5637d..9e56fa3ab6d7 100644 --- a/src/audio/crossover/Kconfig +++ b/src/audio/crossover/Kconfig @@ -5,7 +5,6 @@ config COMP_CROSSOVER select COMP_BLOB select MATH_IIR_DF2T default m if LIBRARY_DEFAULT_MODULAR - default n help Select for Crossover Filter component. A crossover can be used to split a signal into two or more frequency ranges, so that the outputs diff --git a/src/audio/drc/Kconfig b/src/audio/drc/Kconfig index 1e496d3d6f73..9d061c41ea67 100644 --- a/src/audio/drc/Kconfig +++ b/src/audio/drc/Kconfig @@ -10,7 +10,6 @@ config COMP_DRC select MATH_EXP select COMP_BLOB default m if LIBRARY_DEFAULT_MODULAR - default n help Select for Dynamic Range Compressor (DRC) component. A DRC can be used to reduce the volume of loud sounds and amplify silent sounds thus diff --git a/src/audio/google/Kconfig b/src/audio/google/Kconfig index 2f2f5693acc7..61d1608b6891 100644 --- a/src/audio/google/Kconfig +++ b/src/audio/google/Kconfig @@ -5,7 +5,6 @@ menu "Google components" config COMP_GOOGLE_HOTWORD_DETECT bool "Google hotword detector component" select COMP_BLOB - default n help Select for Google hotword detector component. It uses the Google hotword library to do keyword detection. A language model needs to @@ -15,7 +14,6 @@ config COMP_GOOGLE_HOTWORD_DETECT config COMP_GOOGLE_RTC_AUDIO_PROCESSING tristate "Google Real Time Communication Audio processing" select COMP_BLOB - default n help Select for Google real-time communication audio processing. It uses the Google real-time audio processing library to perform @@ -88,7 +86,6 @@ config COMP_GOOGLE_CTC_AUDIO_PROCESSING select COMP_BLOB select GOOGLE_CTC_AUDIO_PROCESSING_MOCK if COMP_STUBS select STATIC_INIT_GNU if ZEPHYR_SOF_MODULE - default n depends on ZEPHYR_SOF_MODULE help Select for Google crosstalk cancellation audio processing. It diff --git a/src/audio/igo_nr/Kconfig b/src/audio/igo_nr/Kconfig index be987594f4ee..d584df40cb67 100644 --- a/src/audio/igo_nr/Kconfig +++ b/src/audio/igo_nr/Kconfig @@ -4,7 +4,6 @@ config COMP_IGO_NR tristate "IGO NR component" select COMP_BLOB select COMP_IGO_NR_STUB if COMP_STUBS - default n help This option enables Intelligo non-speech noise reduction. The feature links to a proprietary binary libigonr.a that currently is supported on different Xtensa DSP platforms. Please email @@ -14,7 +13,6 @@ config COMP_IGO_NR_STUB bool "IGO NR component" select COMP_BLOB depends on COMP_IGO_NR - default n help This option builds the IGO adapter with a stub library, it should only be used for testing or CI purposes. diff --git a/src/audio/module_adapter/Kconfig b/src/audio/module_adapter/Kconfig index 3c762c73f7f8..7ed6b859cd64 100644 --- a/src/audio/module_adapter/Kconfig +++ b/src/audio/module_adapter/Kconfig @@ -26,7 +26,6 @@ menu "Processing modules" config CADENCE_CODEC bool "Cadence codec" - default n help Select for codecs which conforms to the Cadence API. This will cause codec adapter component to include header @@ -35,7 +34,6 @@ menu "Processing modules" if CADENCE_CODEC config CADENCE_CODEC_WRAPPER bool 'Cadence codec wrapper' - default n help Select for cadence_codec_api wrapper function that will allow users to call into codecs which conforms to the Cadence API without @@ -50,7 +48,6 @@ if CADENCE_CODEC config CADENCE_CODEC_AAC_DEC bool "Cadence AAC decoder" - default n help Select for Cadence AAC decoder support. This will cause Cadence codec to include Cadence AAC library @@ -65,7 +62,6 @@ if CADENCE_CODEC config CADENCE_CODEC_BSAC_DEC bool "Cadence BSAC decoder" - default n help Select for Cadence BSAC decoder support. This will cause Cadence codec to include Cadence BSAC library @@ -80,7 +76,6 @@ if CADENCE_CODEC config CADENCE_CODEC_DAB_DEC bool "Cadence DAB decoder" - default n help Select for Cadence DAB decoder support. This will cause Cadence codec to include Cadence DAB library @@ -95,7 +90,6 @@ if CADENCE_CODEC config CADENCE_CODEC_DRM_DEC bool "Cadence DRM decoder" - default n help Select for Cadence DRM decoder support. This will cause Cadence codec to include Cadence DRM library @@ -110,7 +104,6 @@ if CADENCE_CODEC config CADENCE_CODEC_MP3_DEC bool "Cadence MP3 decoder" - default n help Select for Cadence MP3 decoder support. This will cause Cadence codec to include Cadence MP3 library @@ -125,7 +118,6 @@ if CADENCE_CODEC config CADENCE_CODEC_MP3_ENC bool "Cadence MP3 encoder" - default n help Select for Cadence MP3 encoder support. This will cause Cadence codec to include Cadence MP3 library @@ -140,7 +132,6 @@ if CADENCE_CODEC config CADENCE_CODEC_SBC_DEC bool "Cadence SBC decoder" - default n help Select for Cadence SBC decoder support. This will cause Cadence codec to include Cadence SBC library @@ -156,7 +147,6 @@ if CADENCE_CODEC config CADENCE_CODEC_VORBIS_DEC bool "Cadence VORBIS decoder" - default n help Select for Cadence VORBIS decoder support. This will cause Cadence codec to include Cadence VORBIS library @@ -171,7 +161,6 @@ if CADENCE_CODEC config CADENCE_CODEC_SRC_PP bool "Cadence SRC polyphase" - default n help Select for Cadence SRC polyphase support. This will cause Cadence codec to include Cadence SRC library @@ -188,7 +177,6 @@ endif # Cadence config PASSTHROUGH_CODEC bool "Passthrough codec" - default n help Select for a passthrough API codec implementation. This will cause codec adapter component to include header @@ -196,7 +184,6 @@ endif # Cadence config WAVES_CODEC tristate "Waves codec" - default n help Select to include Waves codec. Waves codec implements MaxxEffect API. API definition together with pre-compiled library is shared by Waves Audio Ltd. @@ -207,14 +194,12 @@ endif # Cadence bool "Waves codec stub" depends on WAVES_CODEC != "n" default y if COMP_STUBS - default n help Select to build the waves codec with a stub file. This should only be used for testing or CI. config INTEL_MODULES bool "Intel modules" - default n depends on LIBRARY_MANAGER help Select for a Intel modules API implementation. diff --git a/src/audio/multiband_drc/Kconfig b/src/audio/multiband_drc/Kconfig index b79958d61a9a..07a67573cf24 100644 --- a/src/audio/multiband_drc/Kconfig +++ b/src/audio/multiband_drc/Kconfig @@ -6,7 +6,6 @@ config COMP_MULTIBAND_DRC select CORDIC_FIXED select COMP_BLOB default m if LIBRARY_DEFAULT_MODULAR - default n help Select for Multiband Dynamic Range Compressor (DRC) component. It consists of Emphasis Equalizer, n-way Crossover Filter, per-band DRC, diff --git a/src/audio/nxp/Kconfig b/src/audio/nxp/Kconfig index 64b3f24a856a..45a9a15f80ef 100644 --- a/src/audio/nxp/Kconfig +++ b/src/audio/nxp/Kconfig @@ -2,7 +2,6 @@ config COMP_NXP_EAP tristate "NXP EAP Component" - default n help Select for NXP Essential Audio Processing Component. The EAP is a bundle of audio processing blocks for enhancing the tonal @@ -10,7 +9,6 @@ config COMP_NXP_EAP config COMP_NXP_EAP_STUB tristate "NXP EAP Component stub" - default n depends on COMP_NXP_EAP help Select for NXP EAP stub support. diff --git a/src/audio/rtnr/Kconfig b/src/audio/rtnr/Kconfig index 24345461d2bc..0b872ffb44e8 100644 --- a/src/audio/rtnr/Kconfig +++ b/src/audio/rtnr/Kconfig @@ -4,7 +4,6 @@ config COMP_RTNR tristate "RTNR component" select COMP_BLOB select COMP_RTNR_STUB if COMP_STUBS - default n help Select for Realtek noise reduction/suppression(NR/NS) component. Noise Suppression technology reduces stationary and transient noises in @@ -19,6 +18,5 @@ config COMP_RTNR_STUB bool "RTNR component stub" select COMP_BLOB depends on COMP_RTNR - default n help Stub out the RTNR library for testing and CI purposes. diff --git a/src/audio/smart_amp/Kconfig b/src/audio/smart_amp/Kconfig index 6f947650d48d..34c537d4db16 100644 --- a/src/audio/smart_amp/Kconfig +++ b/src/audio/smart_amp/Kconfig @@ -3,7 +3,6 @@ config COMP_SMART_AMP bool "Smart Amplifier component" select COMP_BLOB - default n help Select for Smart Amp component. This component protect the speaker from overheating and excursion violation. This consists of two parts @@ -50,7 +49,6 @@ endchoice config MAXIM_DSM_STUB bool "Maxim DSM solution" depends on MAXIM_DSM - default n help Select to build the Maxim DSM adapter with a stub library. This should only be used for CI and testing. diff --git a/src/audio/tensorflow/Kconfig b/src/audio/tensorflow/Kconfig index dcb743beeb86..446f9add2849 100644 --- a/src/audio/tensorflow/Kconfig +++ b/src/audio/tensorflow/Kconfig @@ -2,7 +2,6 @@ config COMP_TENSORFLOW tristate "Tensorflow Micro component" - default n depends on SOF_STAGING depends on CPP depends on STD_CPP17 diff --git a/src/audio/up_down_mixer/Kconfig b/src/audio/up_down_mixer/Kconfig index 38ce5adafb51..be3cf794061e 100644 --- a/src/audio/up_down_mixer/Kconfig +++ b/src/audio/up_down_mixer/Kconfig @@ -2,7 +2,6 @@ config COMP_UP_DOWN_MIXER bool "UP_DOWN_MIXER component" - default n depends on IPC_MAJOR_4 help Select for Up Down Mixer component Conversions supported: From 03f1aefb54386288bed8faea9b22a4ef07eef935 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Mon, 1 Sep 2025 19:13:10 +0300 Subject: [PATCH 2/2] app: boards: share common audio build options for Intel ADSPs SOF builds currently use the board Kconfig file to set any target specific build options. This includes modifying Zephyr build options (if different from Zephyr defaults for the SoC) and setting SOF specific options. There is currently no way to share definitions. For Intel ADSP boards, there starts to be a lot of boards and a lot of duplication of settings. Add a new mechanism to include common Kconfig.defconfig for a family of boards. Start with addition of boards/intel_adsp/Kconfig.defconfig and move common defaults for SOF audio modules to the common file. These are options that are not related to hardware features, but we want to set them in the same way for all Intel ADSP targets. Follow-up patches will move more options to the common Kconfig.defconfig and other vendors can add their own board family defconfig files. Signed-off-by: Kai Vehmanen --- Kconfig.sof | 1 - app/Kconfig | 4 ++ app/boards/intel_adsp/Kconfig.defconfig | 63 ++++++++++++++++++++++++ app/boards/intel_adsp_ace15_mtpm.conf | 18 ------- app/boards/intel_adsp_ace20_lnl.conf | 18 ------- app/boards/intel_adsp_ace30_ptl.conf | 19 ------- app/boards/intel_adsp_ace30_ptl_sim.conf | 7 --- app/boards/intel_adsp_ace30_wcl.conf | 12 ----- app/boards/intel_adsp_ace30_wcl_sim.conf | 8 --- app/boards/intel_adsp_ace40_nvl.conf | 11 ----- app/boards/intel_adsp_ace40_nvls.conf | 10 ---- app/boards/intel_adsp_cavs25.conf | 15 ------ app/boards/intel_adsp_cavs25_tgph.conf | 15 ------ 13 files changed, 67 insertions(+), 134 deletions(-) create mode 100644 app/boards/intel_adsp/Kconfig.defconfig diff --git a/Kconfig.sof b/Kconfig.sof index 8a2cf6a1c833..5eb73d3e3150 100644 --- a/Kconfig.sof +++ b/Kconfig.sof @@ -139,7 +139,6 @@ config COLD_STORE_EXECUTE_DEBUG config FAST_GET bool "Enable simple refcounting DRAM data copier" - default n help Enable simple refcounting DRAM data copier for copying processing module data from DRAM to SRAM when the data is needed and freeing diff --git a/app/Kconfig b/app/Kconfig index 0e35e8916398..e1f5bd67295d 100644 --- a/app/Kconfig +++ b/app/Kconfig @@ -5,3 +5,7 @@ config SMP_BOOT_DELAY default y if SMP source "Kconfig.zephyr" + +if SOC_FAMILY_INTEL_ADSP + rsource "boards/intel_adsp/Kconfig.defconfig" +endif diff --git a/app/boards/intel_adsp/Kconfig.defconfig b/app/boards/intel_adsp/Kconfig.defconfig new file mode 100644 index 000000000000..fc0e11eaafed --- /dev/null +++ b/app/boards/intel_adsp/Kconfig.defconfig @@ -0,0 +1,63 @@ +# Common defaults for all Intel ADSP SOF targets +# +# SPDX-License-Identifier: BSD-3-Clause + +# SOF / IPC configuration +# ----------------------- + +config IPC4_BASE_FW_INTEL + default y + +# SOF / audio pipeline and module settings +# ---------------------------------------- + +config COMP_CHAIN_DMA + default y + +config FAST_GET + default y + +config FORMAT_A_LAW + default y + +config FORMAT_FLOAT + default y + +config FORMAT_MU_LAW + default y + +config FORMAT_U8 + default y + +config PCM_CONVERTER_FORMAT_A_LAW + default y + +config PCM_CONVERTER_FORMAT_FLOAT + default y + +config PCM_CONVERTER_FORMAT_MU_LAW + default y + +config PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32 + default y + +config PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32 + default y + +config PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32 + default y + +config PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32 + default y + +config PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32 + default y + +config PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24 + default y + +config PCM_CONVERTER_FORMAT_U8 + default y + +config PIPELINE_2_0 + default y diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index 398003300e90..b9f9d531b617 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/app/boards/intel_adsp_ace15_mtpm.conf @@ -3,11 +3,9 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="mtl" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings CONFIG_COMP_ARIA=y -CONFIG_COMP_CHAIN_DMA=y CONFIG_COMP_CROSSOVER=y CONFIG_COMP_DRC=y CONFIG_COMP_KPB=y @@ -19,23 +17,7 @@ CONFIG_COMP_MULTIBAND_DRC=y CONFIG_COMP_UP_DOWN_MIXER=y CONFIG_COMP_VOLUME_WINDOWS_FADE=y CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y -CONFIG_PIPELINE_2_0=y CONFIG_SAMPLE_KEYPHRASE=y -CONFIG_FAST_GET=y -CONFIG_FORMAT_U8=y -CONFIG_FORMAT_A_LAW=y -CONFIG_FORMAT_MU_LAW=y -CONFIG_FORMAT_FLOAT=y -CONFIG_PCM_CONVERTER_FORMAT_U8=y -CONFIG_PCM_CONVERTER_FORMAT_A_LAW=y -CONFIG_PCM_CONVERTER_FORMAT_MU_LAW=y -CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y # SOF / audio modules / mocks # This mock is part of official sof-bin releases because the CI that diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf index 578d3e4ad225..58b978186578 100644 --- a/app/boards/intel_adsp_ace20_lnl.conf +++ b/app/boards/intel_adsp_ace20_lnl.conf @@ -3,11 +3,9 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="lnl" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings CONFIG_COMP_ARIA=y -CONFIG_COMP_CHAIN_DMA=y CONFIG_COMP_DRC=m CONFIG_COMP_KPB=y CONFIG_COMP_TESTER=m @@ -15,23 +13,7 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y CONFIG_COMP_UP_DOWN_MIXER=y CONFIG_COMP_VOLUME_WINDOWS_FADE=y CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y -CONFIG_PIPELINE_2_0=y CONFIG_SAMPLE_KEYPHRASE=y -CONFIG_FAST_GET=y -CONFIG_FORMAT_U8=y -CONFIG_FORMAT_A_LAW=y -CONFIG_FORMAT_MU_LAW=y -CONFIG_FORMAT_FLOAT=y -CONFIG_PCM_CONVERTER_FORMAT_U8=y -CONFIG_PCM_CONVERTER_FORMAT_A_LAW=y -CONFIG_PCM_CONVERTER_FORMAT_MU_LAW=y -CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y # SOF / infrastructure CONFIG_AMS=y diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf index 56c854739091..a90abefa38e5 100644 --- a/app/boards/intel_adsp_ace30_ptl.conf +++ b/app/boards/intel_adsp_ace30_ptl.conf @@ -3,7 +3,6 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="ptl" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings CONFIG_MM_DRV=y @@ -14,24 +13,6 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y CONFIG_COMP_UP_DOWN_MIXER=y CONFIG_COMP_VOLUME_WINDOWS_FADE=y CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_FORMAT_U8=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_U8=y -CONFIG_PIPELINE_2_0=y -CONFIG_FAST_GET=y -CONFIG_FORMAT_U8=y -CONFIG_FORMAT_A_LAW=y -CONFIG_FORMAT_MU_LAW=y -CONFIG_FORMAT_FLOAT=y -CONFIG_PCM_CONVERTER_FORMAT_U8=y -CONFIG_PCM_CONVERTER_FORMAT_A_LAW=y -CONFIG_PCM_CONVERTER_FORMAT_MU_LAW=y -CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y # SOF / infrastructure CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n diff --git a/app/boards/intel_adsp_ace30_ptl_sim.conf b/app/boards/intel_adsp_ace30_ptl_sim.conf index 34e771a5f2d3..489aa14ca82d 100644 --- a/app/boards/intel_adsp_ace30_ptl_sim.conf +++ b/app/boards/intel_adsp_ace30_ptl_sim.conf @@ -1,6 +1,5 @@ CONFIG_PANTHERLAKE=y CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # turn off SOF drivers CONFIG_COMP_SRC=y @@ -31,12 +30,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_RIMAGE_SIGNING_SCHEMA="ptl" CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y CONFIG_LOG=n CONFIG_LOG_MODE_DEFERRED=n CONFIG_LOG_FUNC_NAME_PREFIX_INF=n diff --git a/app/boards/intel_adsp_ace30_wcl.conf b/app/boards/intel_adsp_ace30_wcl.conf index 70117de366a2..7bdb42daf70d 100644 --- a/app/boards/intel_adsp_ace30_wcl.conf +++ b/app/boards/intel_adsp_ace30_wcl.conf @@ -3,27 +3,15 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="ptl" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings CONFIG_MM_DRV=y -CONFIG_COMP_CHAIN_DMA=y CONFIG_COMP_KPB=y CONFIG_COMP_TESTER=m CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y CONFIG_COMP_UP_DOWN_MIXER=y CONFIG_COMP_VOLUME_WINDOWS_FADE=y CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_FORMAT_U8=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_U8=y -CONFIG_PIPELINE_2_0=y -CONFIG_FAST_GET=y # SOF / infrastructure CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n diff --git a/app/boards/intel_adsp_ace30_wcl_sim.conf b/app/boards/intel_adsp_ace30_wcl_sim.conf index 6daec5544be8..c59ec381db3d 100644 --- a/app/boards/intel_adsp_ace30_wcl_sim.conf +++ b/app/boards/intel_adsp_ace30_wcl_sim.conf @@ -1,6 +1,5 @@ CONFIG_WILDCATLAKE=y CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # turn off SOF drivers CONFIG_COMP_SRC=y @@ -29,13 +28,6 @@ CONFIG_INTEL_ADSP_TIMER=y CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_RIMAGE_SIGNING_SCHEMA="ptl" -CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y CONFIG_LOG=n CONFIG_LOG_MODE_DEFERRED=n CONFIG_LOG_FUNC_NAME_PREFIX_INF=n diff --git a/app/boards/intel_adsp_ace40_nvl.conf b/app/boards/intel_adsp_ace40_nvl.conf index 6a986ddf3cbf..92f5db790dc1 100644 --- a/app/boards/intel_adsp_ace40_nvl.conf +++ b/app/boards/intel_adsp_ace40_nvl.conf @@ -3,13 +3,11 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="nvl" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings CONFIG_COMP_SRC=y CONFIG_MM_DRV=y CONFIG_COMP_ARIA=y -CONFIG_COMP_CHAIN_DMA=y CONFIG_COMP_DRC=y CONFIG_COMP_KPB=y CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y @@ -17,15 +15,6 @@ CONFIG_COMP_TESTER=y CONFIG_COMP_UP_DOWN_MIXER=y CONFIG_COMP_VOLUME_WINDOWS_FADE=y CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_FORMAT_U8=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_U8=y -CONFIG_PIPELINE_2_0=y # SOF / infrastructure CONFIG_PROBE=y diff --git a/app/boards/intel_adsp_ace40_nvls.conf b/app/boards/intel_adsp_ace40_nvls.conf index 6a986ddf3cbf..92de6590a133 100644 --- a/app/boards/intel_adsp_ace40_nvls.conf +++ b/app/boards/intel_adsp_ace40_nvls.conf @@ -3,7 +3,6 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="nvl" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings CONFIG_COMP_SRC=y @@ -17,15 +16,6 @@ CONFIG_COMP_TESTER=y CONFIG_COMP_UP_DOWN_MIXER=y CONFIG_COMP_VOLUME_WINDOWS_FADE=y CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_FORMAT_U8=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_U8=y -CONFIG_PIPELINE_2_0=y # SOF / infrastructure CONFIG_PROBE=y diff --git a/app/boards/intel_adsp_cavs25.conf b/app/boards/intel_adsp_cavs25.conf index 3a0857ea2223..3983c150bbe0 100644 --- a/app/boards/intel_adsp_cavs25.conf +++ b/app/boards/intel_adsp_cavs25.conf @@ -3,11 +3,9 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings CONFIG_COMP_ARIA=y -CONFIG_COMP_CHAIN_DMA=y CONFIG_COMP_CROSSOVER=y CONFIG_COMP_DRC=y CONFIG_COMP_MFCC=y @@ -18,19 +16,6 @@ CONFIG_PCM_CONVERTER_FORMAT_S16LE=y CONFIG_PCM_CONVERTER_FORMAT_S24LE=y CONFIG_PCM_CONVERTER_FORMAT_S32LE=y CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y -CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y -CONFIG_FORMAT_U8=y -CONFIG_FORMAT_A_LAW=y -CONFIG_FORMAT_MU_LAW=y -CONFIG_FORMAT_FLOAT=y -CONFIG_PCM_CONVERTER_FORMAT_U8=y -CONFIG_PCM_CONVERTER_FORMAT_A_LAW=y -CONFIG_PCM_CONVERTER_FORMAT_MU_LAW=y -CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y # SOF / infrastructure CONFIG_AMS=y diff --git a/app/boards/intel_adsp_cavs25_tgph.conf b/app/boards/intel_adsp_cavs25_tgph.conf index 6ef138429bdf..00a04ff27649 100644 --- a/app/boards/intel_adsp_cavs25_tgph.conf +++ b/app/boards/intel_adsp_cavs25_tgph.conf @@ -3,11 +3,9 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings CONFIG_COMP_ARIA=y -CONFIG_COMP_CHAIN_DMA=y CONFIG_COMP_CROSSOVER=y CONFIG_COMP_DRC=y CONFIG_COMP_MFCC=y @@ -18,19 +16,6 @@ CONFIG_PCM_CONVERTER_FORMAT_S16LE=y CONFIG_PCM_CONVERTER_FORMAT_S24LE=y CONFIG_PCM_CONVERTER_FORMAT_S32LE=y CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y -CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y -CONFIG_FORMAT_U8=y -CONFIG_FORMAT_A_LAW=y -CONFIG_FORMAT_MU_LAW=y -CONFIG_FORMAT_FLOAT=y -CONFIG_PCM_CONVERTER_FORMAT_U8=y -CONFIG_PCM_CONVERTER_FORMAT_A_LAW=y -CONFIG_PCM_CONVERTER_FORMAT_MU_LAW=y -CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y # SOF / infrastructure CONFIG_LP_MEMORY_BANKS=1