Merged as 79aab22fcaecf0bd70099e97c92fe3e816e450ce

On Thu, 4 Aug 2022 at 07:01, Sean Rhodes <sean@starlabs.systems> wrote:
Reviewed-by: Sean Rhodes <sean@starlabs.systems>

On Wed, 3 Aug 2022 at 22:14, Guo Dong <guo.dong@intel.com> wrote:

Reviewed-by: Guo Dong <guo.dong@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean Rhodes
Sent: Tuesday, August 2, 2022 1:00 PM
To: devel@edk2.groups.io
Cc: Rhodes, Sean <sean@starlabs.systems>; Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.com>
Subject: [edk2-devel] [PATCH 1/2] UefiPayloadPkg: Add a Macro to enable Boot Logo

Add a macro called BOOTSPLASH_IMAGE, which when enabled, will display a logo at boot time.

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
---
 .../Library/PlatformBootManagerLib/PlatformBootManager.c | 9 +++++++++
 .../PlatformBootManagerLib/PlatformBootManagerLib.inf    | 1 +
 UefiPayloadPkg/UefiPayloadPkg.dsc                        | 6 ++++++
 UefiPayloadPkg/UefiPayloadPkg.fdf                        | 4 ++++
 4 files changed, 20 insertions(+)

diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
index b360e29dfe..a3b98f713d 100644
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.
+++ c
@@ -243,6 +243,8 @@ PlatformBootManagerAfterConsole (
 {   EFI_GRAPHICS_OUTPUT_BLT_PIXEL  Black;   EFI_GRAPHICS_OUTPUT_BLT_PIXEL  White;+  EDKII_PLATFORM_LOGO_PROTOCOL   *PlatformLogo;+  EFI_STATUS                     Status;    if (mUniversalPayloadPlatformBootManagerOverrideInstance != NULL) {     mUniversalPayloadPlatformBootManagerOverrideInstance->AfterConsole ();@@ -252,6 +254,13 @@ PlatformBootManagerAfterConsole (
   Black.Blue = Black.Green = Black.Red = Black.Reserved = 0;   White.Blue = White.Green = White.Red = White.Reserved = 0xFF; +  Status = gBS->LocateProtocol (&gEdkiiPlatformLogoProtocolGuid, NULL, (VOID **)&PlatformLogo);++  if (!EFI_ERROR (Status)) {+    gST->ConOut->ClearScreen (gST->ConOut);+    BootLogoEnableLogo ();+  }+   EfiBootManagerConnectAll ();   EfiBootManagerRefreshAllBootOption (); diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index 9f58c460cd..7ec93420f2 100644
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerL
+++ ib.inf
@@ -39,6 +39,7 @@
   UefiRuntimeServicesTableLib   UefiLib   UefiBootManagerLib+  BootLogoLib   PcdLib   DxeServicesLib   MemoryAllocationLibdiff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index e78e959ce4..abe1a42709 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -42,6 +42,7 @@
   DEFINE CRYPTO_PROTOCOL_SUPPORT      = FALSE   DEFINE SD_MMC_TIMEOUT               = 1000000   DEFINE USE_CBMEM_FOR_CONSOLE        = FALSE+  DEFINE BOOTSPLASH_IMAGE             = FALSE    #   # NULL:    NullMemoryTestDxe@@ -229,6 +230,7 @@
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf+  BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf   FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf @@ -432,6 +434,7 @@
    gUefiPayloadPkgTokenSpaceGuid.PcdDispatchModuleAbove4GMemory|$(ABOVE_4G_MEMORY)   gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape|$(BOOT_MANAGER_ESCAPE)+   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1800000  !if $(CRYPTO_PROTOCOL_SUPPORT) == TRUE@@ -616,6 +619,9 @@
 !endif   UefiCpuPkg/CpuDxe/CpuDxe.inf   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf+!if $(BOOTSPLASH_IMAGE)+  MdeModulePkg/Logo/LogoDxe.inf+!endif   MdeModulePkg/Application/UiApp/UiApp.inf {     <LibraryClasses>       NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.infdiff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index afdd6447a7..d7c9db191c 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -165,6 +165,10 @@ INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
 INF UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf+!if $(BOOTSPLASH_IMAGE)+INF MdeModulePkg/Logo/LogoDxe.inf+!endif+ # # PCI Support #--
2.34.1



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92059): https://edk2.groups.io/g/devel/message/92059
Mute This Topic: https://groups.io/mt/92779006/1781375
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [guo.dong@intel.com]
-=-=-=-=-=-=