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

[stable-v2.7] config/lnl.toml: drop now invalid signed_pkg.partition_usage #190

Merged
merged 1 commit into from
Oct 30, 2023

Conversation

marc-hb
Copy link
Contributor

@marc-hb marc-hb commented Oct 27, 2023

Fixes commit fbea593 ("rimage: mtl: fix key slot setup based on imr type") which broke LNL compilation like this:

error: 1 unparsed keys left in 'signed_pkg'
error: key 'signed_pkg' parsing error

Of course LNL is never going to be released on this stable-v2.7 branch but this one-line fix is just the smallest and simplest fix to keep everything building and green. It also keeps everything simple and consistent.

This commit does not change the final image (compared to before rimage commit fbea593) because the default value is now 0x20 + IMR type.

Fixes are normally submitted to the main branch first and then cherry picked to stable branches. However fbea593 has been made in stable-v2.7 first so make this change also in stable-v2.7 first for consistency.

Fixes commit fbea593 ("rimage: mtl: fix key slot setup based on imr
type") which broke LNL compilation like this:

```
error: 1 unparsed keys left in 'signed_pkg'
error: key 'signed_pkg' parsing error
```

Of course LNL is never going to be released on this stable-v2.7 branch
but this one-line fix is just the smallest and simplest fix to keep
everything building and green. It also keeps everything simple and
consistent.

This commit does not change the final image (compared to before rimage
commit fbea593) because the default value is now 0x20 + IMR type.

Fixes are normally submitted to the main branch first and then cherry
picked to stable branches. However fbea593 has been made in
stable-v2.7 first so make this change also in stable-v2.7 first for
consistency.

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

marc-hb commented Oct 27, 2023

Successfully tested in sof/stable-v2.7 https://github.com/thesofproject/sof/actions/runs/6672554043/job/18136695980?pr=8410

Github Actions all green thanks to this.

@marc-hb marc-hb changed the title config/lnl.toml: drop now invalid signed_pkg.partition_usage [stable-v2.7] config/lnl.toml: drop now invalid signed_pkg.partition_usage Oct 27, 2023
@marc-hb marc-hb marked this pull request as ready for review October 27, 2023 22:05
@marc-hb marc-hb added the bug Something isn't working label Oct 27, 2023
Copy link
Member

@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.

@kv2019i @abonislawski pls review

@marc-hb marc-hb merged commit 469102a into thesofproject:stable-v2.7 Oct 30, 2023
4 checks passed
@marc-hb marc-hb deleted the lnl-partition branch October 30, 2023 18:02
marc-hb added a commit to marc-hb/sof that referenced this pull request Oct 30, 2023
Update rimage to version 469102a8f6052ce6a374b870ea945a84d04c3b1a

Only one new commit to fix Github Actions:

  config/lnl.toml: drop now invalid signed_pkg.partition_usage

See thesofproject/rimage#190

Signed-off-by: Marc Herbert <[email protected]>
kv2019i pushed a commit to thesofproject/sof that referenced this pull request Oct 31, 2023
Update rimage to version 469102a8f6052ce6a374b870ea945a84d04c3b1a

Only one new commit to fix Github Actions:

  config/lnl.toml: drop now invalid signed_pkg.partition_usage

See thesofproject/rimage#190

Signed-off-by: Marc Herbert <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants