-
Notifications
You must be signed in to change notification settings - Fork 347
zephyr: stop using CONFIG_SOF to identify Zephyr build #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.
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
base: main
Are you sure you want to change the base?
Conversation
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 <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR removes the dependency on CONFIG_SOF (which was defined in Zephyr's SOF module Kconfig) and replaces it with CONFIG_ZEPHYR_SOF_MODULE. This change prepares for the removal of the SOF module from the upstream Zephyr manifest.
Key changes:
- Replaced
CONFIG_SOFwithCONFIG_ZEPHYR_SOF_MODULEin CMakeLists.txt - Removed
if SOFwrapper from Kconfig file - Removed
CONFIG_SOF=ysetting from app/prj.conf
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| zephyr/Kconfig | Removed the conditional if SOF wrapper around SOF configuration options |
| zephyr/CMakeLists.txt | Updated build condition from CONFIG_SOF to CONFIG_ZEPHYR_SOF_MODULE |
| app/prj.conf | Removed explicit CONFIG_SOF=y setting as it's no longer needed |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
@kv2019i some build issue in CI, do we need any CI changes ? |
|
There are issues with this still. I can't really fully explain what happens. Some CONFIG_FOO options are missing when other settings (defined in same Kconfig file) are present. E.g. .config for MTL build: So CONFIG_MAX_CORE_COUNT is set but not CONFG_CORE_COUNT, both Kconfig options defined in the smae file. Hmm. Will debug this more. |
|
Ok, wow, it seems this this the extra CONFIG_CORE_COUNT definition in arch/host now. I now start to realize why nobody else has cleaned this up. This is quite messed up. Let me put this to draft and try to push this commit together with #10334 . |
|
See dependencies in #10334 (comment) . PRs #10334 and #10319 need to be merged first, before this PR can go in. |
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.