config/coreboot-msi: resolve $(MAINBOARDDIR) in IFD/ME blob paths for MSI boards#2110
Merged
tlaurion merged 1 commit intolinuxboot:masterfrom May 8, 2026
Merged
Conversation
… MSI boards
- Replace unexpanded coreboot make variable $(MAINBOARDDIR) with literal
resolved paths in CONFIG_IFD_BIN_PATH and CONFIG_ME_BIN_PATH
- Z690 (ms7d25): 3rdparty/dasharo-blobs/msi/ms7d25/{descriptor,me}.bin
- Z790 (ms7e06): 3rdparty/dasharo-blobs/msi/ms7e06/{descriptor,me}.bin
- This allows bin/validate_cbfs_ifd_fit.sh to locate the IFD descriptor
for IFD vs CBFS size validation, which was silently skipped before
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
There was a problem hiding this comment.
Pull request overview
This PR fixes IFD/ME blob path resolution for MSI coreboot configs by replacing the unexpanded $(MAINBOARDDIR) make variable with concrete, resolved paths. This enables bin/validate_cbfs_ifd_fit.sh to reliably locate the Intel Flash Descriptor and perform IFD-vs-CBFS size validation for MSI boards (previously skipped because the path could not exist on disk as-written).
Changes:
- Replace
CONFIG_IFD_BIN_PATH/CONFIG_ME_BIN_PATHvalues using$(MAINBOARDDIR)with resolved3rdparty/dasharo-blobs/msi/<board-id>/...paths. - Apply the update consistently across Z690 (ms7d25) and Z790 (ms7e06) MSI variants, in both
.configand.config_defconfigfiles.
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| config/coreboot-msi_z790p_ddr5.config_defconfig | Hardcodes resolved IFD/ME blob paths for Z790 DDR5 so validation scripts can find the descriptor. |
| config/coreboot-msi_z790p_ddr5.config | Same as above for the full config. |
| config/coreboot-msi_z790p_ddr4.config_defconfig | Hardcodes resolved IFD/ME blob paths for Z790 DDR4. |
| config/coreboot-msi_z790p_ddr4.config | Same as above for the full config. |
| config/coreboot-msi_z690a_ddr5.config_defconfig | Hardcodes resolved IFD/ME blob paths for Z690 DDR5. |
| config/coreboot-msi_z690a_ddr5.config | Same as above for the full config. |
| config/coreboot-msi_z690a_ddr4.config_defconfig | Hardcodes resolved IFD/ME blob paths for Z690 DDR4. |
| config/coreboot-msi_z690a_ddr4.config | Same as above for the full config. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ifd/cbfs size avalidation now works as any other boards, while MSI boards have the biggest SPI chips outhere which is problematic since tools didn't follow (max 16mb chips supported by flashtools/cbfs issue #2074)
ie:
Closes #2095