Merged
Conversation
This was referenced Jan 29, 2026
filipleple
requested changes
Jan 30, 2026
Member
filipleple
left a comment
filipleple
left a comment
There was a problem hiding this comment.
For some reason, build fails for v540tu without the CONFIG_EDK2_CAPSULES_V2 flag:
build.py...
/home/coreboot/coreboot/payloads/external/edk2/workspace/Dasharo/DasharoPayloadPkg/CapsuleSplashDxe/CapsuleSplashDxe.inf(62): error 000E: File/directory not found in workspace
Logo.bmp is not found in packages path:
/home/coreboot/coreboot/payloads/external/edk2/workspace/Dasharo
/home/coreboot/coreboot/payloads/external/edk2/workspace/edk2-platforms/Platform/Intel
/home/coreboot/coreboot/payloads/external/edk2/workspace/edk2-platforms/Silicon/Intel
/home/coreboot/coreboot/payloads/external/edk2/workspace/edk2-platforms/Features/Intel
/home/coreboot/coreboot/payloads/external/edk2/workspace/edk2-platforms/Features/Intel/Debugging
/home/coreboot/coreboot/payloads/external/edk2/workspace/edk2-platforms/Features/Intel/Network
/home/coreboot/coreboot/payloads/external/edk2/workspace/edk2-platforms/Features/Intel/OutOfBandManagement
/home/coreboot/coreboot/payloads/external/edk2/workspace/edk2-platforms/Features/Intel/PowerManagement
/home/coreboot/coreboot/payloads/external/edk2/workspace/edk2-platforms/Features/Intel/SystemInformation
/home/coreboot/coreboot/payloads/external/edk2/workspace/edk2-platforms/Features/Intel/UserInterface
/home/coreboot/coreboot/payloads/external/edk2/workspace/edk2-platforms/Drivers
- Failed -
Build end time: 13:35:01, Jan.30 2026
Build total time: 00:00:04
This is a temporary change until capsules-v2 branch is merged into dasharo. Change-Id: Ieecc09debeb9184c6f34c6d222b74878d5c382a6 Upstream-Status: Inappropriate [Dasharo downstream] Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Upstream-Status: Inappropriate [Dasharo downstream] Change-Id: Id1b33912eb0172b430dbf3bf3073a823aee8d4d2 Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
This replaces CONFIG_EDK2_CAPSULE_ON_DISK_SUPPORT and CONFIG_EDK2_SHOW_CAPSULE_REPORT to avoid proliferation of trivial options which are always enabled together. Most wouldn't show up anywhere but build-system files. Similarly switch from specifying individual PCDs for EDK to passing a macro which will do the same but on the side of EDK. There is no need to bake this knowledge into coreboot's build system. Change-Id: I603c08d07c325e4d05b86edb6667694a21212c1d Upstream-Status: Inappropriate [Dasharo downstream] Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Change-Id: Iaccb60dedad5ea089f297968e7c0778b052d87de Upstream-Status: Inappropriate [Dasharo downstream] Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
SergiiDmytruk
force-pushed
the
capsules-v2-logo
branch
from
f006a97 to
bfc648f
Compare
filipleple
approved these changes
Feb 2, 2026
Member
|
Tested on V540TU. I've rebased and merged the EDK2 part, so I've pushed a commit updating the EDK2 revision. Will merge this one as well as soon as CI passes. |
…er merge The target topmost commit changed after rebasing and merging the EDK2 PR. Upstream-Status: Inappropriate [Dasharo downstream] Signed-off-by: Filip Lewiński <filip.lewinski@3mdeb.com>
filipleple
force-pushed
the
capsules-v2-logo
branch
from
aa0da29 to
62985bb
Compare
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
2 participants
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.
Instead of adding another feature flag, the previous ones were combined into
CONFIG_EDK2_CAPSULES_V2which now just passes a macro to EDK while previously individual PCDs were set. This simplifies adding new changes and doesn't require constantly updating configs.In addition to EDK2 bump logo required copying
BOOTSPLASH_REGION_LOGO_FILEinto EDK (if not set,MdeModulePkg/Logo/Logo.bmpis used which is influenced byEDK2_BOOTSPLASH_FILE).issue: Dasharo/dasharo-issues#1437
EDK PR: Dasharo/edk2#294
ref: dsh-1129