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

zephyr: fix a path to a header, build LPS conditionally 

Use a correct path to the cAVS memory.h header, build cAVS LPS
only when the respective Kconfig option is selected.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2020-11-12 10:49:35 +01:00 committed by Liam Girdwood
parent 4d4a9d7299
commit c8ae78ab0e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/platform/intel/cavs/lps_wait.c
View File

@ -18,7 +18,8 @@
#include <stdint.h>
#ifdef __ZEPHYR__
#include <cavs/memory.h>
#include <cavs/lib/memory.h>
#include <platform/lib/memory.h>
/* TODO: declare local copy to avoid naming collisions with Zephyr and SOF */
/* headers until common functions can be separated out */
int memcpy_s(void *dest, size_t dest_size, const void *src, size_t src_size);

9
zephyr/CMakeLists.txt
View File

@ -201,6 +201,9 @@ if (CONFIG_SOC_SERIES_INTEL_CAVS_V18)
${SOF_PLATFORM_PATH}/intel/cavs/lib/dai.c
${SOF_PLATFORM_PATH}/intel/cavs/lib/dma.c
#${SOF_PLATFORM_PATH}/intel/cavs/lps_pic_restore_vector.S
)
zephyr_library_sources_ifdef(CONFIG_CAVS_LPS
${SOF_PLATFORM_PATH}/intel/cavs/lps_wait.c
)
@ -257,6 +260,9 @@ if (CONFIG_SOC_SERIES_INTEL_CAVS_V20)
${SOF_PLATFORM_PATH}/intel/cavs/lib/dai.c
${SOF_PLATFORM_PATH}/intel/cavs/lib/dma.c
#${SOF_PLATFORM_PATH}/intel/cavs/lps_pic_restore_vector.S
)
zephyr_library_sources_ifdef(CONFIG_CAVS_LPS
${SOF_PLATFORM_PATH}/intel/cavs/lps_wait.c
)
@ -315,6 +321,9 @@ if (CONFIG_SOC_SERIES_INTEL_CAVS_V25)
${SOF_PLATFORM_PATH}/intel/cavs/lib/dai.c
${SOF_PLATFORM_PATH}/intel/cavs/lib/dma.c
#${SOF_PLATFORM_PATH}/intel/cavs/lps_pic_restore_vector.S
)
zephyr_library_sources_ifdef(CONFIG_CAVS_LPS
${SOF_PLATFORM_PATH}/intel/cavs/lps_wait.c
)