Skip to content

rimage: minor fixes - #11122

Merged
kv2019i merged 3 commits into
thesofproject:mainfrom
abonislawski:rimage_meu_cse_fixes
Aug 26, 2026
Merged

rimage: minor fixes#11122
kv2019i merged 3 commits into
thesofproject:mainfrom
abonislawski:rimage_meu_cse_fixes

Conversation

@abonislawski

Copy link
Copy Markdown
Member

No description provided.

Leave unsupported SUE and ACE MEU callbacks unset
and report a runtime error before writer dispatch.

Signed-off-by: Adrian Bonislawski <adrian.bonislawski@intel.com>
Reject relocatable manifest creation when the TOML
configuration does not provide module metadata.

Signed-off-by: Adrian Bonislawski <adrian.bonislawski@intel.com>
Test the outcome of the scan instead of the loop index,
so the check no longer depends on the loop bound, and
align the message with the one used by verify_image().

Signed-off-by: Adrian Bonislawski <adrian.bonislawski@intel.com>
Copilot AI lite review requested due to automatic review settings August 25, 2026 09:11

Copilot AI left a comment

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.

Pull request overview

This PR makes small robustness fixes to the rimage tool, primarily by replacing assertions/implicit assumptions with explicit user-facing errors and by disabling MEU signing paths for targets that don’t support them.

Changes:

  • Reject MEU signing early when the selected target does not provide a write_firmware_meu() implementation (replaces an assert()-style failure with a clear CLI error).
  • Fail fast when building relocatable images without TOML module configuration, avoiding null dereferences later.
  • Improve resigning error handling/messages when scanning input binaries for the $CPD CSE header marker.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
tools/rimage/src/rimage.c Adds an explicit early error for unsupported MEU signing targets and removes a runtime assert before calling the MEU writer.
tools/rimage/src/manifest.c Adds a required-config check for relocatable image module handling and improves $CPD header-not-found detection/message during resign.
tools/rimage/src/adsp_config.c Disables MEU signing for specific manifest configurations by setting write_firmware_meu to NULL, aligning behavior with the new CLI guard.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@kv2019i

kv2019i commented Aug 26, 2026

Copy link
Copy Markdown
Collaborator

Testbench fail known, not related to this PR. Proceeding with merge.

@kv2019i
kv2019i merged commit f7789c9 into thesofproject:main Aug 26, 2026
49 of 50 checks passed
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