Skip to content

app/stub*.conf: add CONFIG_SAMPLE_SMART_AMP=y #8425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 4 commits into from
Nov 2, 2023
Merged

app/stub*.conf: add CONFIG_SAMPLE_SMART_AMP=y #8425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5223bf
samples/Kconfig: fix dependency on top-level CONFIG_SAMPLES
marc-hb Nov 1, 2023
21a8e22
Revert "samples: Fix zephyr config"
marc-hb Oct 31, 2023
a82a4f5
Remove samples/smart_amp_test dependency on CAVS || ACE
marc-hb Nov 1, 2023
040c320
app/stub*.conf: add CONFIG_SAMPLE_SMART_AMP=y
marc-hb Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/stub_build_all_ipc3.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ CONFIG_COMP_RTNR=y
# sad->in_channels = audio_stream_get_channels(&source_buffer->stream);
CONFIG_COMP_SMART_AMP=n
CONFIG_MAXIM_DSM=y
CONFIG_SAMPLES=y
CONFIG_SAMPLE_SMART_AMP=y
2 changes: 2 additions & 0 deletions app/stub_build_all_ipc4.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ CONFIG_COMP_ARIA=y
CONFIG_COMP_CHAIN_DMA=y
CONFIG_COMP_UP_DOWN_MIXER=y
CONFIG_IPC_MAJOR_4=y
CONFIG_SAMPLES=y
CONFIG_SAMPLE_SMART_AMP=y
4 changes: 4 additions & 0 deletions src/samples/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ config SAMPLES
help
Select to build sample code

if SAMPLES

rsource "audio/Kconfig"

endif

endmenu
2 changes: 0 additions & 2 deletions src/samples/audio/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause

menu "Audio component samples"
visible if SAMPLES

config SAMPLE_SMART_AMP
depends on CAVS || ACE
bool "Smart amplifier test component"
default y
help
Expand Down
18 changes: 8 additions & 10 deletions zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,16 +683,14 @@ zephyr_library_sources_ifdef(CONFIG_COMP_RTNR
${SOF_AUDIO_PATH}/rtnr/rtnr.c
)

if (CONFIG_SAMPLES)
if(CONFIG_IPC_MAJOR_3)
zephyr_library_sources_ifdef(CONFIG_SAMPLE_SMART_AMP
${SOF_SAMPLES_PATH}/audio/smart_amp_test_ipc3.c
)
elseif(CONFIG_IPC_MAJOR_4)
zephyr_library_sources_ifdef(CONFIG_SAMPLE_SMART_AMP
${SOF_SAMPLES_PATH}/audio/smart_amp_test_ipc4.c
)
endif()
if(CONFIG_IPC_MAJOR_3)
zephyr_library_sources_ifdef(CONFIG_SAMPLE_SMART_AMP
${SOF_SAMPLES_PATH}/audio/smart_amp_test_ipc3.c
)
elseif(CONFIG_IPC_MAJOR_4)
zephyr_library_sources_ifdef(CONFIG_SAMPLE_SMART_AMP
${SOF_SAMPLES_PATH}/audio/smart_amp_test_ipc4.c
)
endif()

zephyr_library_sources_ifdef(CONFIG_COMP_RTNR_STUB
Expand Down