OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Audio: Fix the kconfig error of mixin_mixout. 

Fixes the commit f4d043724d ("Audio: Move components related config
to subfolder").

Due to a copy/paste error, the content of mixin_mixout/Kconfig has
been a copy of aria/Kconfig. This patch fixes the copy/paste error,
and adds IPC version dependence for COMP_MIXER and COMP_MIXIN_MIXOUT.

Signed-off-by: Andrula Song <andrula.song@intel.com>
This commit is contained in:
Andrula Song 2024-01-30 15:53:20 +08:00 committed by Liam Girdwood
parent 9831a9ded7
commit 97a50e3243
4 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/Kconfig
View File

@ -96,6 +96,8 @@ config COMP_TONE
rsource "mixer/Kconfig"
rsource "mixin_mixout/Kconfig"
rsource "mux/Kconfig"
config COMP_KPB

1
src/audio/mixer/Kconfig
View File

@ -2,6 +2,7 @@
config COMP_MIXER
bool "Mixer component"
depends on IPC_MAJOR_3
default y
help
Select for Mixer component

16
src/audio/mixin_mixout/Kconfig
View File

@ -1,12 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
config COMP_ARIA
bool "ARIA component"
default n
depends on IPC_MAJOR_4
help
Select for Automatic Regressive Input Amplifier Module component
ARIA applies variable gain into incoming signal.
Applied gain is in range <1, 2 power attenuation>
Currently ARIA introduces gain transition and algorithmic
latency equal to 1 ms.
config COMP_MIXIN_MIXOUT
bool "Mixin_mixout component"
depends on IPC_MAJOR_4
default y
help
Select for Mixin_mixout component

24
zephyr/CMakeLists.txt
View File

@ -551,19 +551,17 @@ zephyr_library_sources_ifdef(CONFIG_COMP_KPB
${SOF_AUDIO_PATH}/kpb.c
)
if(CONFIG_IPC_MAJOR_3)
zephyr_library_sources_ifdef(CONFIG_COMP_MIXER
${SOF_AUDIO_PATH}/mixer/mixer.c
${SOF_AUDIO_PATH}/mixer/mixer_generic.c
${SOF_AUDIO_PATH}/mixer/mixer_hifi3.c
)
elseif(CONFIG_IPC_MAJOR_4)
zephyr_library_sources_ifdef(CONFIG_COMP_MIXER
${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout.c
${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_generic.c
${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_hifi3.c
)
endif()
zephyr_library_sources_ifdef(CONFIG_COMP_MIXER
${SOF_AUDIO_PATH}/mixer/mixer.c
${SOF_AUDIO_PATH}/mixer/mixer_generic.c
${SOF_AUDIO_PATH}/mixer/mixer_hifi3.c
)
zephyr_library_sources_ifdef(CONFIG_COMP_MIXIN_MIXOUT
${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout.c
${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_generic.c
${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_hifi3.c
)
zephyr_library_sources_ifdef(CONFIG_COMP_TONE
${SOF_AUDIO_PATH}/tone.c