Skip to content

zephyr: stop using CONFIG_SOF to identify Zephyr build (w/ Zephyr Nov/20 update) #10335

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 3 commits into from
Nov 24, 2025
Merged

zephyr: stop using CONFIG_SOF to identify Zephyr build (w/ Zephyr Nov/20 update) #10335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce5b5fa
zephyr: stop using CONFIG_SOF to identify Zephyr build
kv2019i Oct 28, 2025
7b94e1d
test: ztest: fix ztest/unit tests to build when CONFIG_SOF is removed
kv2019i Nov 18, 2025
628afcd
west.yml: update zephyr to f3b9d1871104
kv2019i Nov 20, 2025
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
1 change: 0 additions & 1 deletion app/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CONFIG_SOF=y
CONFIG_BUILD_OUTPUT_BIN=n

# The additional stripped .elf files are deterministic.
Expand Down
1 change: 0 additions & 1 deletion test/ztest/unit/fast-get/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ target_include_directories(app PRIVATE

# Define SOF-specific configurations for unit testing
target_compile_definitions(app PRIVATE
-DCONFIG_SOF_LOG_LEVEL=CONFIG_LOG_DEFAULT_LEVEL
-DCONFIG_ZEPHYR_POSIX=1
)

Expand Down
1 change: 1 addition & 0 deletions test/ztest/unit/fast-get/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CONFIG_ZTEST=y
CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n
1 change: 1 addition & 0 deletions test/ztest/unit/list/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CONFIG_ZTEST=y
CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n
1 change: 0 additions & 1 deletion test/ztest/unit/math/basic/arithmetic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ target_include_directories(app PRIVATE

# Define SOF-specific configurations for unit testing
target_compile_definitions(app PRIVATE
-DCONFIG_SOF_LOG_LEVEL=CONFIG_LOG_DEFAULT_LEVEL
-DCONFIG_ZEPHYR_POSIX=1
-DCONFIG_LIBRARY=1
-DCONFIG_NUMBERS_VECTOR_FIND=1
Expand Down
1 change: 1 addition & 0 deletions test/ztest/unit/math/basic/arithmetic/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CONFIG_ZTEST=y
CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n
1 change: 0 additions & 1 deletion test/ztest/unit/math/basic/trigonometry/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ target_include_directories(app PRIVATE

# Define SOF-specific configurations for unit testing
target_compile_definitions(app PRIVATE
-DCONFIG_SOF_LOG_LEVEL=CONFIG_LOG_DEFAULT_LEVEL
-DCONFIG_ZEPHYR_POSIX=1
-DCONFIG_LIBRARY=1
-DUNIT_TEST=1
Expand Down
1 change: 1 addition & 0 deletions test/ztest/unit/math/basic/trigonometry/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CONFIG_ZTEST=y
CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ manifest:

- name: zephyr
repo-path: zephyr
revision: 3568e1b6d5cdd51a6b964a2a1d6d29200fea2056
revision: f3b9d1871104b0d69abf6182ef7d262652b13729
remote: zephyrproject

# Import some projects listed in zephyr/west.yml@revision
Expand Down
4 changes: 2 additions & 2 deletions zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# compile every Zephyr module that can be found. See
# sof/zephyr/module.yml and
# https://docs.zephyrproject.org/latest/develop/modules.html
if(CONFIG_SOF)
if(CONFIG_SOF_FULL_ZEPHYR_APPLICATION)

if(CONFIG_ZEPHYR_POSIX)
set(ARCH host)
Expand Down Expand Up @@ -567,4 +567,4 @@ include(../scripts/cmake/uuid-registry.cmake)
# Create Trace realtive file paths
sof_append_relative_path_definitions(modules_sof)

endif() # CONFIG_SOF
endif() # CONFIG_SOF_FULL_ZEPHYR_APPLICATION
10 changes: 7 additions & 3 deletions zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
if SOF
config SOF_FULL_ZEPHYR_APPLICATION
bool "Build full SOF Zephyr application"
default y
help
Top-level build option to enable full build of the SOF application
on top of Zephyr. This should be set to no only for unit test and
such special build targets.

Copy link
Contributor

@ujfalusi ujfalusi Nov 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should you retain the if here and the endif:

if SOF_FULL_ZEPHYR_APPLICATION

or better:

menuconfig SOF_FULL_ZEPHYR_APPLICATION
	bool "Build full SOF Zephyr application"
	default y
	help
	  Top-level build option to enable full build of the SOF application
	  on top of Zephyr. This should be set to no only for unit test and
	  such special build targets.

if SOF_FULL_ZEPHYR_APPLICATION
...
endif

Copy link
Collaborator Author

@kv2019i kv2019i Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ujfalusi I left this out on purposew. There are some Kconfigs that are useful to be availlable for SOF ztest type of uses and with PR, these can now be left defined (but set to "n" in the test configs if not needed).

It seems CI is all good with this as well, so I'd say the less ifdefs the better.

config SOF_STAGING
bool "Enable SOF staging features and modules"
Expand Down Expand Up @@ -203,5 +209,3 @@ config STACK_SIZE_IPC_TX
default 2048
help
IPC sender work-queue thread stack size. Keep a power of 2.

endif
Loading