Skip to content

Commit 17b2514

Browse files
committed
cmake/zephyr: unify cmake rules for src/idc
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules to use definitions in src/idc/ instead. Link: #8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent b94ee8f commit 17b2514

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/idc/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22

3-
add_local_sources(sof idc.c )
3+
is_zephyr(zephyr)
4+
if(zephyr)
5+
add_local_sources_ifdef(CONFIG_SMP sof idc.c)
6+
add_local_sources(sof zephyr_idc.c)
7+
else()
8+
add_local_sources(sof idc.c)
9+
endif()

zephyr/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ add_subdirectory(../src/math/ math_unused_install/)
205205
# remaining directories (in alphabetical order)
206206
add_subdirectory(../src/audio/ audio_unused_install/)
207207
add_subdirectory(../src/debug/ debug_unused_install/)
208+
add_subdirectory(../src/idc/ idc_unused_install/)
208209
add_subdirectory(../src/init/ init_unused_install/)
209210
add_subdirectory(../src/ipc/ ipc_unused_install/)
210211
add_subdirectory(../src/lib/ lib_unused_install/)
@@ -461,8 +462,6 @@ zephyr_library_sources(
461462
# SOF core infrastructure - runs on top of Zephyr
462463
${SOF_SRC_PATH}/arch/xtensa/drivers/cache_attr.c
463464

464-
${SOF_SRC_PATH}/idc/zephyr_idc.c
465-
466465
# Bridge wrapper between SOF and Zephyr APIs - Will shrink over time.
467466
wrapper.c
468467
edf_schedule.c
@@ -482,10 +481,6 @@ zephyr_library_sources_ifdef(CONFIG_FAST_GET lib/fast-get.c)
482481

483482
# Optional SOF sources - depends on Kconfig - WIP
484483

485-
zephyr_library_sources_ifdef(CONFIG_MULTICORE
486-
${SOF_SRC_PATH}/idc/idc.c
487-
)
488-
489484
zephyr_library_sources_ifdef(CONFIG_DW_DMA
490485
${SOF_DRIVERS_PATH}/dw/dma.c
491486
)

0 commit comments

Comments
 (0)