>From dc0d6d7175d132b28a2d3ce16cc4373644435793 Mon Sep 17 00:00:00 2001 Message-Id: From: Sean Rhodes Date: Thu, 6 Jan 2022 15:15:29 +0000 Subject: [PATCH] UefiPayloadPkg: Provide option to use Boot Splash Provide a build option to use a Boot Splash logo. Signed-off-by: Sean Rhodes --- .../Library/PlatformBootManagerLib/PlatformBootManager.c | 5 +++++ .../PlatformBootManagerLib/PlatformBootManagerLib.inf    | 2 ++ UefiPayloadPkg/UefiPayloadPkg.dec                        | 3 +++ UefiPayloadPkg/UefiPayloadPkg.dsc                        | 9 +++++++++ UefiPayloadPkg/UefiPayloadPkg.fdf                        | 3 +++ 5 files changed, 22 insertions(+) diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c index a8ead775ea..3bded489ef 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c @@ -243,6 +243,11 @@ PlatformBootManagerAfterConsole ( Black.Blue = Black.Green = Black.Red = Black.Reserved = 0; White.Blue = White.Green = White.Red = White.Reserved = 0xFF; +  if (FixedPcdGetBool (PcdBootSplashImage)) { +    gST->ConOut->ClearScreen (gST->ConOut); +    BootLogoEnableLogo (); +  } + EfiBootManagerConnectAll (); EfiBootManagerRefreshAllBootOption (); diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 9c4a9da943..306bd33b7a 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -39,6 +39,7 @@ UefiRuntimeServicesTableLib UefiLib UefiBootManagerLib +  BootLogoLib PcdLib DxeServicesLib MemoryAllocationLib @@ -73,3 +74,4 @@ gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile +  gUefiPayloadPkgTokenSpaceGuid.PcdBootSplashImage diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec b/UefiPayloadPkg/UefiPayloadPkg.dec index 551f0a4915..4f5756d575 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dec +++ b/UefiPayloadPkg/UefiPayloadPkg.dec @@ -83,6 +83,9 @@ gUefiPayloadPkgTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000|UINT32|0x gUefiPayloadPkgTokenSpaceGuid.PcdPcdDriverFile|{ 0x57, 0x72, 0xcf, 0x80, 0xab, 0x87, 0xf9, 0x47, 0xa3, 0xfe, 0xD5, 0x0B, 0x76, 0xd8, 0x95, 0x41 }|VOID*|0x00000018 +# BootSplash Image +gUefiPayloadPkgTokenSpaceGuid.PcdBootSplashImage|TRUE|BOOLEAN|0x00000021 + ## FFS filename to find the default variable initial data file. # @Prompt FFS Name of variable initial data file gUefiPayloadPkgTokenSpaceGuid.PcdNvsDataFile |{ 0x1a, 0xf1, 0xb1, 0xae, 0x42, 0xcc, 0xcf, 0x4e, 0xac, 0x60, 0xdb, 0xab, 0xf6, 0xca, 0x69, 0xe6 }|VOID*|0x00000025 diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc index 1ce96a51c1..700ac02395 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -33,6 +33,7 @@ DEFINE UNIVERSAL_PAYLOAD            = FALSE DEFINE SECURITY_STUB_ENABLE         = TRUE DEFINE SMM_SUPPORT                  = FALSE +  DEFINE BOOTSPLASH_IMAGE             = FALSE # # SBL:      UEFI payload for Slim Bootloader # COREBOOT: UEFI payload for coreboot @@ -209,6 +210,9 @@ CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf +!if $(BOOTSPLASH_IMAGE) == TRUE +  BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf +!endif CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf @@ -399,6 +403,8 @@ gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask       | 0x1 !endif +  gUefiPayloadPkgTokenSpaceGuid.PcdBootSplashImage|$(BOOTSPLASH_IMAGE) + [PcdsPatchableInModule.X64] gPcAtChipsetPkgTokenSpaceGuid.PcdRtcIndexRegister|$(RTC_INDEX_REGISTER) gPcAtChipsetPkgTokenSpaceGuid.PcdRtcTargetRegister|$(RTC_TARGET_REGISTER) @@ -545,6 +551,9 @@ !endif UefiCpuPkg/CpuDxe/CpuDxe.inf MdeModulePkg/Universal/BdsDxe/BdsDxe.inf +!if $(BOOTSPLASH_IMAGE) == TRUE +  MdeModulePkg/Logo/LogoDxe.inf +!endif MdeModulePkg/Application/UiApp/UiApp.inf { NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf index c7b04978ad..a71d655687 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -158,6 +158,9 @@ INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf INF UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf +!if $(BOOTSPLASH_IMAGE) == TRUE +INF MdeModulePkg/Logo/LogoDxe.inf +!endif # # PCI Support # -- 2.32.0