Skip to content

Commit 95f5897

Browse files
committed
zephyr: stop using CONFIG_SOF to identify Zephyr build
Prepare for change in Zephyr to drop SOF module from the upstream Zephyr manifest. Remove use of CONFIG_SOF which is defined in work/zephyr/modules/Kconfig.sof, but will now be removed. Fix this by using CONFIG_ZEPHYR_SOF_MODULE instead. This is defined by the Zephyr build system when using the work/sof/west.yml for building SOF. If SOF is built without Zephyr (e.g. testbench or cmocka build), this define will not be set. After this change, one must use the SOF work/sof/west.yml manifest to build SOF with Zephyr. This is used by all public instructions and CI jobs already. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent a86f371 commit 95f5897

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

app/prj.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
CONFIG_SOF=y
21
CONFIG_BUILD_OUTPUT_BIN=n
32

43
# The additional stripped .elf files are deterministic.

zephyr/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# compile every Zephyr module that can be found. See
33
# sof/zephyr/module.yml and
44
# https://docs.zephyrproject.org/latest/develop/modules.html
5-
if(CONFIG_SOF)
5+
if(CONFIG_ZEPHYR_SOF_MODULE)
66

77
if(CONFIG_ZEPHYR_POSIX)
88
set(ARCH host)
@@ -555,4 +555,4 @@ include(../scripts/cmake/uuid-registry.cmake)
555555
# Create Trace realtive file paths
556556
sof_append_relative_path_definitions(modules_sof)
557557

558-
endif() # CONFIG_SOF
558+
endif() # CONFIG_ZEPHYR_SOF_MODULE

zephyr/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
if SOF
2-
31
config SOF_STAGING
42
bool "Enable SOF staging features and modules"
53
help
@@ -166,5 +164,3 @@ config STACK_SIZE_IPC_TX
166164
default 2048
167165
help
168166
IPC sender work-queue thread stack size. Keep a power of 2.
169-
170-
endif

0 commit comments

Comments
 (0)