Skip to content

Conversation

@kv2019i
Copy link
Collaborator

@kv2019i kv2019i commented Dec 1, 2025

CONFIG_SOF was removed in upstream Zephyr and this broke builds with user-space overlay.

Fixes: 60780a6 ("west.yml: update zephyr to f3b9d1871104")

CONFIG_SOF was removed in upstream Zephyr and this broke builds
with user-space overlay.

Fixes: 60780a6 ("west.yml: update zephyr to f3b9d1871104")
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Copilot AI review requested due to automatic review settings December 1, 2025 13:19
Copy link

Copilot AI left a 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 fixes a userspace build breakage caused by the removal of CONFIG_SOF in upstream Zephyr. The fix updates the preprocessor condition to use CONFIG_SOF_FULL_ZEPHYR_APPLICATION instead.

  • Replaced deprecated CONFIG_SOF macro with CONFIG_SOF_FULL_ZEPHYR_APPLICATION

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@kv2019i kv2019i requested review from lyakh and softwarecki December 1, 2025 13:19
@kv2019i
Copy link
Collaborator Author

kv2019i commented Dec 1, 2025

@lyakh @softwarecki @lgirdwood Would be nice to get #10119 (or something similar) merged, so we could catch this type of problems in pull request CI...

@lgirdwood
Copy link
Member

@lyakh @softwarecki @lgirdwood Would be nice to get #10119 (or something similar) merged, so we could catch this type of problems in pull request CI...

Think we are just pending a CI pass, it has approvals.

Copy link
Collaborator

@softwarecki softwarecki left a comment

Choose a reason for hiding this comment

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

This PR has a title very similar to the recently merged

which initially caused confusion because I thought that one was already merged. Indeed, there is a build issue that this PR fixes.

@lgirdwood lgirdwood merged commit 717f51e into thesofproject:main Dec 2, 2025
27 of 44 checks passed
@kv2019i
Copy link
Collaborator Author

kv2019i commented Dec 2, 2025

@lgirdwood @lyakh The CI had failures on this still, we will need to follow-up. E.g. https://github.com/thesofproject/sof/actions/runs/19824062171/job/56792943080?pr=10406

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants