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

Update preserve_rom function to check if /tmp/cbfs-init.rom should be used. #10

Merged
merged 1 commit into from
Jun 11, 2024

Conversation

mdrobnak
Copy link

@mdrobnak mdrobnak commented Jun 7, 2024

On the MSI boards, the "internal" CBFS region, which is the default when calling cbfs without arguments, returns no files, or when called with -v, errors:

Header delta          : -29261268
Header magic          : ffffffff
Header version        : ffffffff
Header ROM size       : ffffffff
Header boot block size: ffffffff
Header align          : ffffffff
Header offset         : ffffffff
Header arch           : ffffffff
Failed to find valid header

This patch is an extension of linuxboot@4d533b3 changes, which if configured uses flashrom to extract the image of the CBFS there, and here it uses that extracted image to add files to the image which is to be flashed.

This has been tested on my MSI Z790-P DDR4 board.

@mdrobnak
Copy link
Author

mdrobnak commented Jun 7, 2024

Closing in favor of linuxboot#1699

@mdrobnak mdrobnak closed this Jun 7, 2024
@tlaurion
Copy link

tlaurion commented Jun 7, 2024

@mkopec the ideal fix would be to extend cbfs.c capabilities as discussed under linuxboot#1699 (comment). Thoughts?

@mdrobnak
Copy link
Author

Re-opening here. This will fix any MSI users for the time being.

@mdrobnak mdrobnak reopened this Jun 10, 2024
@tlaurion
Copy link

tlaurion commented Jun 10, 2024

@mkopec the ideal fix would be to extend cbfs.c capabilities as discussed under linuxboot#1699 (comment). Thoughts?

@mkopec is upstreaming MSI boards under linuxboot/heads planned short term?

Copy link
Member

@mkopec mkopec left a comment

Choose a reason for hiding this comment

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

Thank you for the fix! As we discussed elsewhere, ideally we'd add support for the extended BIOS window to flashtools and not use flashrom, but I have no problem merging this for now.

@mkopec mkopec merged commit cb43039 into Dasharo:master Jun 11, 2024
@mkopec
Copy link
Member

mkopec commented Jun 11, 2024

@mkopec is upstreaming MSI boards under linuxboot/heads planned short term?

paging @macpijan

@tlaurion
Copy link

@macpijan needs upstreaming alongside MSI boards.

@tlaurion
Copy link

linuxboot#1699 : put as draft. Please refer to that PR upstream with a PR that deprecates it.

@tlaurion
Copy link

Opened Dasharo/dasharo-issues#897 to track

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.

3 participants