[CHERRY-PICK] MinPlatformPkg: Align VariableRuntimeDxe DSC condition - #440
Merged
Michael Kubacki (makubacki) merged 1 commit intoSep 24, 2026
Conversation
Member
|
I think we should treat this as a cherry-pick waiting for the upstream PR with the same change to merge first. |
PaddyDeng-v
force-pushed
the
paddydeng-v-apply-edk2-platforms-1046
branch
from
September 24, 2026 05:41
c9e7d59 to
ec1bc6f
Compare
PaddyDeng-v
changed the title
PaddyDeng-v
force-pushed
the
paddydeng-v-apply-edk2-platforms-1046
branch
from
September 24, 2026 05:46
ec1bc6f to
04441b3
Compare
Author
|
Hi Michael Kubacki (@makubacki) , The upstream commit already merged and I updated this PR to cherry-pick it. |
Michael Kubacki (makubacki)
approved these changes
Sep 24, 2026
Guard VariableRuntimeDxe in CoreDxeInclude.dsc with PcdBootToShellOnly, matching CoreUefiBootInclude.fdf. This keeps the DSC component list aligned with the modules included in the firmware volume. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Signed-off-by: Paddy Deng (AMI US Holdings Inc) <v-dengpaddy@microsoft.com> (cherry picked from commit ee6aaabed93b46ec3361e981961ca4c5d6d15b6b)
Michael Kubacki (makubacki)
force-pushed
the
paddydeng-v-apply-edk2-platforms-1046
branch
from
September 24, 2026 19:48
04441b3 to
2641f98
Compare
Michael Kubacki (makubacki)
enabled auto-merge (rebase)
September 24, 2026 19:49
Aaron (apop5)
approved these changes
Sep 24, 2026
Michael Kubacki (makubacki)
merged commit Sep 24, 2026
05f7c27
into
microsoft:release/202511
21 checks passed
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
3 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.
Description
Cherry-pick the change merged in tianocore/edk2-platforms#1046.
Guard
VariableRuntimeDxe.infinCoreDxeInclude.dscwithgMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == TRUE, matching the existing condition inCoreUefiBootInclude.fdf. This keeps the DSC component list aligned with the modules included in the firmware volume whenPcdBootToShellOnlyis disabled.Upstream commit: ee6aaabed93b46ec3361e981961ca4c5d6d15b6b
How This Was Tested
Confirmed that the DSC and FDF place
VariableRuntimeDxe.infunder the same PCD condition, and checked the patch for whitespace errors using CRLF-aware Git settings.Integration Instructions
N/A