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

zephyr: adjust for new location of audio component samples 

Audio component samples have been moved to a new location, fix Zephyr
builds to account for it.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2020-10-08 11:55:09 +02:00 committed by Liam Girdwood
parent 9a02ffdeb7
commit b672923809
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zephyr/CMakeLists.txt
View File

@ -35,6 +35,7 @@ zephyr_interface_library_named(SOF)
set(SOF_SRC_PATH "../src") set(SOF_SRC_PATH "../src")
set(SOF_PLATFORM_PATH "${SOF_SRC_PATH}/platform") set(SOF_PLATFORM_PATH "${SOF_SRC_PATH}/platform")
set(SOF_AUDIO_PATH "${SOF_SRC_PATH}/audio") set(SOF_AUDIO_PATH "${SOF_SRC_PATH}/audio")
set(SOF_SAMPLES_PATH "${SOF_SRC_PATH}/samples")
set(SOF_LIB_PATH "${SOF_SRC_PATH}/lib") set(SOF_LIB_PATH "${SOF_SRC_PATH}/lib")
set(SOF_DRIVERS_PATH "${SOF_SRC_PATH}/drivers") set(SOF_DRIVERS_PATH "${SOF_SRC_PATH}/drivers")
set(SOF_IPC_PATH "${SOF_SRC_PATH}/ipc") set(SOF_IPC_PATH "${SOF_SRC_PATH}/ipc")
@ -439,8 +440,8 @@ zephyr_library_sources_ifdef(CONFIG_COMP_DAI
${SOF_AUDIO_PATH}/dai.c ${SOF_AUDIO_PATH}/dai.c
) )
zephyr_library_sources_ifdef(CONFIG_COMP_TEST_KEYPHRASE zephyr_library_sources_ifdef(CONFIG_SAMPLE_KEYPHRASE
${SOF_AUDIO_PATH}/detect_test.c ${SOF_SAMPLES_PATH}/audio/detect_test.c
) )
zephyr_library_sources_ifdef(CONFIG_COMP_VOLUME zephyr_library_sources_ifdef(CONFIG_COMP_VOLUME

2
zephyr/wrapper.c
View File

@ -415,7 +415,7 @@ int task_main_start(struct sof *sof)
sys_comp_eq_iir_init(); sys_comp_eq_iir_init();
} }
if (IS_ENABLED(CONFIG_COMP_KPB)) { if (IS_ENABLED(CONFIG_SAMPLE_KEYPHRASE)) {
sys_comp_keyword_init(); sys_comp_keyword_init();
} }