Skip to content
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

xtensa-build-zephyr.py: don't pass -c $plat.toml to rimage #8602

Merged
merged 3 commits into from
Dec 12, 2023

Conversation

marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Dec 11, 2023

3 commits; separately tested in TEST PRs #8600 and #8601

This is a preliminary step for .toml modularization (#8490)

The main branch hasn't supported IPC3 for tgl for a long time.

Follow-up to commit a17c282 ("xtensa-build-zephyr: remove ipc
option")

Signed-off-by: Marc Herbert <[email protected]>
Rename:
- tgl-cavs.toml   to tgl.toml
- tgl-h-cavs.toml to tgl-h.toml

Remove the IPC3/IPC4 switch added by commit 6f71808
("xtensa-build-zephyr.py: add ipc4 build support for tgl")

This brings back consistency which is required for the .toml
split (thesofproject#8490)

Signed-off-by: Marc Herbert <[email protected]>
Let west/sign.py find the appropriate .toml file.

This prepares for .toml modularization thesofproject#8490

Signed-off-by: Marc Herbert <[email protected]>
@marc-hb

This comment was marked as resolved.

@marc-hb marc-hb requested a review from lyakh December 11, 2023 05:49
@marc-hb marc-hb marked this pull request as ready for review December 11, 2023 08:10
Copy link
Collaborator

@kv2019i kv2019i left a comment

Choose a reason for hiding this comment

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

Wondering a bit if we need to bring some of this back later for other vendors to add IPC4 builds (on the side). Oh well, probably better do this in more generic way than this version.

This PR looks good, one mandatory CI check failing that needs to be clarified before merge.

@wszypelt
Copy link

@marc-hb we had a problem with tgl over the weekend, we managed to fix it, and the PR run shows that everything went well

@marc-hb
Copy link
Collaborator Author

marc-hb commented Dec 11, 2023

Thanks @wszypelt , https://sof-ci.01.org/sof-pr-viewer/#/build/PR8602/build13257497 is now green.

cavs https://sof-ci.01.org/sofpr/PR8602/build972/devicetest/index.html and MTL https://sof-ci.01.org/sofpr/PR8602/build971/devicetest/index.html have only well known suspend/resume and GSC failures.

Wondering a bit if we need to bring some of this back later for other vendors to add IPC4 builds (on the side). Oh well, probably better do this in more generic way than this version.

Good point and... good point.

@marc-hb
Copy link
Collaborator Author

marc-hb commented Dec 11, 2023

Oh well, probably better do this in more generic way than this version.

With the pre-processing of .toml files, a simple xtensa-build-zephyr.py -o myIPC4.conf should allow adjusting their content with CONFIG_XXX, see for instance
https://github.com/thesofproject/sof/pull/8490/files#diff-3f57e45c1942452e9aef045ee008af39ad7375ec70dc8755a4d26de62694bfcf

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.

4 participants