<div dir="ltr"><div class="gmail_default" style="font-family:trebuchet ms,sans-serif">Merged as 79aab22fcaecf0bd70099e97c92fe3e816e450ce</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, 4 Aug 2022 at 07:01, Sean Rhodes <sean@starlabs.systems> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div class="gmail_default" style="font-family:"trebuchet ms",sans-serif">Reviewed-by: Sean Rhodes <sean@starlabs.systems></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, 3 Aug 2022 at 22:14, Guo Dong <<a href="mailto:guo.dong@intel.com" target="_blank">guo.dong@intel.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Reviewed-by: Guo Dong <<a href="mailto:guo.dong@intel.com" target="_blank">guo.dong@intel.com</a>><br>
<br>
-----Original Message-----<br>
From: <a href="mailto:devel@edk2.groups.io" target="_blank">devel@edk2.groups.io</a> <<a href="mailto:devel@edk2.groups.io" target="_blank">devel@edk2.groups.io</a>> On Behalf Of Sean Rhodes<br>
Sent: Tuesday, August 2, 2022 1:00 PM<br>
To: <a href="mailto:devel@edk2.groups.io" target="_blank">devel@edk2.groups.io</a><br>
Cc: Rhodes, Sean <sean@starlabs.systems>; Dong, Guo <<a href="mailto:guo.dong@intel.com" target="_blank">guo.dong@intel.com</a>>; Ni, Ray <<a href="mailto:ray.ni@intel.com" target="_blank">ray.ni@intel.com</a>><br>
Subject: [edk2-devel] [PATCH 1/2] UefiPayloadPkg: Add a Macro to enable Boot Logo<br>
<br>
Add a macro called BOOTSPLASH_IMAGE, which when enabled, will display a logo at boot time.<br>
<br>
Cc: Guo Dong <<a href="mailto:guo.dong@intel.com" target="_blank">guo.dong@intel.com</a>><br>
Cc: Ray Ni <<a href="mailto:ray.ni@intel.com" target="_blank">ray.ni@intel.com</a>><br>
Signed-off-by: Sean Rhodes <sean@starlabs.systems><br>
---<br>
.../Library/PlatformBootManagerLib/PlatformBootManager.c | 9 +++++++++<br>
.../PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 +<br>
UefiPayloadPkg/UefiPayloadPkg.dsc | 6 ++++++<br>
UefiPayloadPkg/UefiPayloadPkg.fdf | 4 ++++<br>
4 files changed, 20 insertions(+)<br>
<br>
diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c<br>
index b360e29dfe..a3b98f713d 100644<br>
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c<br>
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.<br>
+++ c<br>
@@ -243,6 +243,8 @@ PlatformBootManagerAfterConsole (<br>
{ 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 (<br>
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<br>
index 9f58c460cd..7ec93420f2 100644<br>
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf<br>
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerL<br>
+++ ib.inf<br>
@@ -39,6 +39,7 @@<br>
UefiRuntimeServicesTableLib UefiLib UefiBootManagerLib+ BootLogoLib PcdLib DxeServicesLib MemoryAllocationLibdiff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc<br>
index e78e959ce4..abe1a42709 100644<br>
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc<br>
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc<br>
@@ -42,6 +42,7 @@<br>
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 @@<br>
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 @@<br>
gUefiPayloadPkgTokenSpaceGuid.PcdDispatchModuleAbove4GMemory|$(ABOVE_4G_MEMORY) gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape|$(BOOT_MANAGER_ESCAPE)+ gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1800000 !if $(CRYPTO_PROTOCOL_SUPPORT) == TRUE@@ -616,6 +619,9 @@<br>
!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<br>
index afdd6447a7..d7c9db191c 100644<br>
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf<br>
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf<br>
@@ -165,6 +165,10 @@ INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf<br>
INF UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf+!if $(BOOTSPLASH_IMAGE)+INF MdeModulePkg/Logo/LogoDxe.inf+!endif+ # # PCI Support #--<br>
2.34.1<br>
<br>
<br>
<br>
-=-=-=-=-=-=<br>
Groups.io Links: You receive all messages sent to this group.<br>
View/Reply Online (#92059): <a href="https://edk2.groups.io/g/devel/message/92059" rel="noreferrer" target="_blank">https://edk2.groups.io/g/devel/message/92059</a><br>
Mute This Topic: <a href="https://groups.io/mt/92779006/1781375" rel="noreferrer" target="_blank">https://groups.io/mt/92779006/1781375</a><br>
Group Owner: <a href="mailto:devel%2Bowner@edk2.groups.io" target="_blank">devel+owner@edk2.groups.io</a><br>
Unsubscribe: <a href="https://edk2.groups.io/g/devel/unsub" rel="noreferrer" target="_blank">https://edk2.groups.io/g/devel/unsub</a> [<a href="mailto:guo.dong@intel.com" target="_blank">guo.dong@intel.com</a>]<br>
-=-=-=-=-=-=<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
</blockquote></div>
</blockquote></div>
<div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links:<p> You receive all messages sent to this group. <p> <a target="_blank" href="https://edk2.groups.io/g/devel/message/92104">View/Reply Online (#92104)</a> | | <a target="_blank" href="https://groups.io/mt/92779006/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a><br> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com]<br> <div width="1" style="color:white;clear:both">_._,_._,_</div>