uefi-ref/edk2
1
0
Fork 0
mirror of https://github.com/tianocore/edk2 synced 2026-08-27 00:23:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge f65a4c2e21 into 7735ed4f8e

Browse source
This commit is contained in:
Sean Rhodes 2026-08-25 17:41:48 +02:00 • committed by GitHub
commit baa5e2e4a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
View file

@ -231,6 +231,8 @@ PlatformBootManagerBeforeConsole (
EFI_INPUT_KEY CustomKey;
EFI_INPUT_KEY Down;
EFI_BOOT_MANAGER_LOAD_OPTION BootOption;
EDKII_PLATFORM_LOGO_PROTOCOL *PlatformLogo;
BOOLEAN ConsoleInitialized;
//
// Register ENTER as CONTINUE key
@ -267,8 +269,18 @@ PlatformBootManagerBeforeConsole (
//
// Process update capsules that don't contain embedded drivers.
//
ConsoleInitialized = FALSE;
if (GetBootModeHob () == BOOT_ON_FLASH_UPDATE) {
// TODO: when enabling capsule support for laptops, add a battery check here
PlatformConsoleInit ();
ConsoleInitialized = TRUE;
Status = gBS->LocateProtocol (&gEdkiiPlatformLogoProtocolGuid, NULL, (VOID **)&PlatformLogo);
if (!EFI_ERROR (Status) && (gST != NULL) && (gST->ConOut != NULL)) {
gST->ConOut->ClearScreen (gST->ConOut);
BootLogoEnableLogo ();
}
Status = ProcessCapsules ();
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a(): ProcessCapsule() failed with: %r\n", __func__, Status));
@ -286,7 +298,9 @@ PlatformBootManagerBeforeConsole (
//
EfiBootManagerDispatchDeferredImages ();
PlatformConsoleInit ();
if (!ConsoleInitialized) {
PlatformConsoleInit ();
}
}
/**

8
UefiPayloadPkg/UefiPayloadPkg.fdf
View file

@ -144,6 +144,14 @@ APRIORI DXE {
INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
INF UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf
!if $(CAPSULE_SUPPORT) == TRUE
!if $(BOOTSPLASH_IMAGE)
INF UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
INF MdeModulePkg/Logo/LogoDxe.inf
!endif
!endif
}
#