Skip to content

manifest: optional: remove sof from optional manifest#97946

Merged
kartben merged 3 commits intozephyrproject-rtos:mainfrom
nashif:topic/modules/optional_to_external_2
Nov 15, 2025
Merged

manifest: optional: remove sof from optional manifest#97946
kartben merged 3 commits intozephyrproject-rtos:mainfrom
nashif:topic/modules/optional_to_external_2

Conversation

@nashif
Copy link
Copy Markdown
Member

@nashif nashif commented Oct 20, 2025

Nothing in Zephyr uses SOF, it is the other way round, SOF uses
Zephyr, creating a cyclic dependency in some cases making it difficult
to apply changes to areas used by SOF upstream.

Part of #91061

Signed-off-by: Anas Nashif anas.nashif@intel.com

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Oct 20, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
sof ❌ zephyrproject-rtos/sof@ba8de75 N/A (Removed) N/A

DNM label due to: 1 removed project

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@github-actions github-actions Bot added manifest manifest-sof DNM (manifest) This PR should not be merged (controlled by action-manifest) labels Oct 20, 2025
@nashif nashif force-pushed the topic/modules/optional_to_external_2 branch 2 times, most recently from 7ec8d06 to d691906 Compare October 20, 2025 19:24
@nashif
Copy link
Copy Markdown
Member Author

nashif commented Oct 20, 2025

@LaurentiuM1234 see https://github.com/zephyrproject-rtos/zephyr/actions/runs/18662605621/job/53206439186?pr=97946. You are checking for CONFIG_SOF in various places, this is not correct and is basically a layering violation. SOF is not part of Zephyr and we should not depend on it for hardware configuration. Can can you please take a look and see how you can get this working with check for SOF?

@nashif
Copy link
Copy Markdown
Member Author

nashif commented Oct 21, 2025

@lyakh @kv2019i is this workaround still needed:

@nashif nashif requested review from kv2019i, lgirdwood and lyakh October 21, 2025 11:43
lgirdwood
lgirdwood previously approved these changes Oct 21, 2025
Copy link
Copy Markdown

@lgirdwood lgirdwood left a comment

Choose a reason for hiding this comment

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

Ack - SOF depends on Zephyr not a cyclic dependency.

@kv2019i
Copy link
Copy Markdown
Contributor

kv2019i commented Oct 21, 2025

@nashif wrote:

@lyakh @kv2019i is this workaround still needed:

I had no idea we had such a workaround. Any idea who added this comment? Git-blame gives me just the gigantic HWMv2 commit.

It seems this is still depended on, builds will fail if I remove this.

@nashif
Copy link
Copy Markdown
Member Author

nashif commented Oct 21, 2025

I had no idea we had such a workaround. Any idea who added this comment? Git-blame gives me just the gigantic HWMv2 commit.

35a97cb

@nashif
Copy link
Copy Markdown
Member Author

nashif commented Oct 22, 2025

It seems this is still depended on, builds will fail if I remove this.

@kv2019i Is this something we can fix in SOF, ie. in

https://github.com/thesofproject/sof/blob/cb65c6a93e254fc5196f7640e2c47dda0da34a23/src/arch/host/Kconfig#L7

with:

diff --git a/src/arch/host/Kconfig b/src/arch/host/Kconfig
index de92f43a8..5ef3f7420 100644
--- a/src/arch/host/Kconfig
+++ b/src/arch/host/Kconfig
@@ -4,6 +4,6 @@

 config CORE_COUNT
        int
-       default 1
+       default MP_MAX_NUM_CPUS
        help
          Number of used cores

@LaurentiuM1234
Copy link
Copy Markdown
Contributor

@nashif do you want to have this for v4.3.0? If not, I'll schedule #97988 for v4.4.0

@nashif
Copy link
Copy Markdown
Member Author

nashif commented Oct 22, 2025

@nashif do you want to have this for v4.3.0? If not, I'll schedule #97988 for v4.4.0

we should try and aim for 4.3

@nashif nashif marked this pull request as ready for review October 22, 2025 11:06
@nashif
Copy link
Copy Markdown
Member Author

nashif commented Oct 22, 2025

@nashif do you want to have this for v4.3.0? If not, I'll schedule #97988 for v4.4.0

just added your commits into this PR to get CI to verify all changes in one place.

@nashif
Copy link
Copy Markdown
Member Author

nashif commented Oct 22, 2025

see thesofproject/sof#10321 for changes needed on the SOF side

@nashif nashif force-pushed the topic/modules/optional_to_external_2 branch from 9f338e3 to 44c214d Compare October 22, 2025 13:08
@zephyrbot zephyrbot added the area: West West utility label Oct 22, 2025
Comment thread MAINTAINERS.yml
labels:
- "area: Debugging"

"West project: sof":
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

typo in commit message: "Nothing in Zephyr uses SOF" was probably meant

Nothing in Zephyr uses SOF, it is the other way round, SOF uses
Zephyr, creating a cyclic dependency in some cases making it difficult
to apply changes to areas used by SOF upstream.

Part of zephyrproject-rtos#91061

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
During transition to HWMv2 this workaround was added, which should
instead be in SOF and not in Zephyr, as CORE_COUNT is a SOF Kconfig.

Remove this and instead set the CORE_COUNT in SOF to the
MP_MAX_NUM_CPUS.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
Do not depend on SOF config, use RIMAGE_SCHEMA instead, defined in SOF.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
@nashif nashif force-pushed the topic/modules/optional_to_external_2 branch from 44c214d to 0424ca3 Compare October 27, 2025 14:59
@sonarqubecloud
Copy link
Copy Markdown

@nashif nashif removed the DNM (manifest) This PR should not be merged (controlled by action-manifest) label Nov 14, 2025
@kartben
Copy link
Copy Markdown
Member

kartben commented Nov 15, 2025

@nashif would be nice to add sof as an external module then?

@kartben kartben merged commit 95b48cd into zephyrproject-rtos:main Nov 15, 2025
44 of 45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants