Skip to content

zephyr: adapt to SOF not being a zephyr module #10321

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

Draft
nashif wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

zephyr: adapt to SOF not being a zephyr module #10321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/arch/host/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

config CORE_COUNT
int
default 1
Copy link
Collaborator

@kv2019i kv2019i Oct 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This is bit of a works-by-accident type of thing. This does work (I had to check the build logs), but normal Zephyr builds should not even use this file as this is supposed to be used by host (=x86) builds like testbench and ALSA SOF plugin only. This is ok as transitory solution, but I'll look for a more sane place to set the core count....

Copy link
Contributor Author

@nashif nashif Oct 22, 2025

Choose a reason for hiding this comment

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

there is already another place where this is set src/platform/Kconfig

config CORE_COUNT
        int "Number of cores"
        default MP_MAX_NUM_CPUS if KERNEL_BIN_NAME = "zephyr"
        default MAX_CORE_COUNT
        range 1 MAX_CORE_COUNT
        help
          Number of used cores
          Lowering available core count could result in lower power consumption

Copy link
Contributor Author

@nashif nashif Oct 22, 2025

Choose a reason for hiding this comment

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

but normal Zephyr builds should not even use this file as this is supposed to be used by host (=x86) builds like testbench and ALSA SOF plugin only.

aha, now I remember the issue, that was a weird one, without ARCH being defined after the migration to hwmv2, this starts failing and I guess those depend on ARCH

Copy link
Contributor Author

@nashif nashif Oct 27, 2025

Choose a reason for hiding this comment

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

can we actually just get rid of src/arch/host/Kconfig and just rely on what we have "src/platform/Kconfig"?

default MP_MAX_NUM_CPUS
help
Number of used cores
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: e876dee6f2e78788e983385de231eab50e1db543
revision: pull/97946/head
remote: zephyrproject

# Import some projects listed in zephyr/west.yml@revision
Expand Down
4 changes: 0 additions & 4 deletions zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
# 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_ZEPHYR_POSIX)
set(ARCH host)
set(PLATFORM "posix")
Expand Down Expand Up @@ -554,5 +552,3 @@ include(../scripts/cmake/uuid-registry.cmake)

# Create Trace realtive file paths
sof_append_relative_path_definitions(modules_sof)

endif() # CONFIG_SOF
4 changes: 0 additions & 4 deletions zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
if SOF

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

endif
Loading