From e2acb76028036fef9ca03e256d78fe9acfe86462 Mon Sep 17 00:00:00 2001 From: xianhu2x Date: Thu, 12 Oct 2017 14:52:57 +0800 Subject: QR code display under EFI Shell Showing QR code and website link to screen under EFI shell for MinnowBoard. Output website link to serial port too. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: xianhu2x --- .../Board/MinnowBoard3/BoardInitPostMem/BoardInit.c | 5 +++++ .../BoardInitPostMem/BoardInitPostMem.inf | 1 + .../Common/PlatformSettings/PlatformDxe/Platform.c | 21 ++++++++++++++++++++- .../PlatformSettings/PlatformDxe/PlatformDxe.inf | 10 ++++++++++ Platform/BroxtonPlatformPkg/PlatformPkg.dec | 3 +++ Platform/BroxtonPlatformPkg/PlatformPkg.fdf | 3 +++ 6 files changed, 42 insertions(+), 1 deletion(-) (limited to 'Platform') diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c index 0aa9246f4a..69b7df977d 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c @@ -101,6 +101,11 @@ MinnowBoard3PostMemInitCallback ( // Set PcdSueCreek // PcdSetBool (PcdSueCreek, FALSE); + + // + //Set PcdLogoDisplay + // + PcdSetBool (PcdLogoDisplay, TRUE); // // Add init steps here diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf index 8fa5ffa641..1392cdd153 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf @@ -60,6 +60,7 @@ gPlatformModuleTokenSpaceGuid.PcdResetType gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid gPlatformModuleTokenSpaceGuid.PcdSueCreek + gPlatformModuleTokenSpaceGuid.PcdLogoDisplay [Guids] gEfiPlatformInfoGuid diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c index a6d251ded2..54e80df917 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c @@ -15,6 +15,7 @@ #include "PlatformDxe.h" #include "Platform.h" +#include "Logo.h" #include #include @@ -254,7 +255,6 @@ EnableAcpiCallback ( IoWrite16 (AcpiBaseAddr + R_ACPI_PM1_CNT, Pm1Cnt); } - VOID PlatformScInitBeforeBoot ( VOID @@ -699,6 +699,8 @@ InitializePlatform ( EFI_HOB_GUID_TYPE *FdoEnabledGuidHob = NULL; EFI_PLATFORM_INFO_HOB *PlatformInfoHob; EFI_PEI_HOB_POINTERS Hob; + EFI_EVENT EfiShellEvent = NULL; + VOID *mEfiShellProtocolRegistration; mImageHandle = ImageHandle; @@ -900,6 +902,23 @@ InitializePlatform ( OverrideSdCardPresence(); + // + //QR code showing under EFI Shell + // + if (PcdGetBool(PcdLogoDisplay)) { + Status = gBS->CreateEvent ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + EfiShellProtocolCallback, + NULL, + &EfiShellEvent + ); + Status = gBS->RegisterProtocolNotify ( + &gEfiShellProtocolGuid, + EfiShellEvent, + &mEfiShellProtocolRegistration + ); + } return EFI_SUCCESS; } diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf index ee8fd5a689..b15d0ed8ae 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf @@ -34,6 +34,7 @@ IchTcoReset.c SensorVar.c Rtc.c + Logo.c [Packages] MdePkg/MdePkg.dec @@ -66,6 +67,7 @@ DxeSaPolicyLib ConfigBlockLib GpioLib + DxeServicesLib [Guids] gEfiBiosIdGuid @@ -116,6 +118,9 @@ gDxePlatformTdtPolicyGuid gDxePlatformSeCPolicyGuid gEfiSeCOperationProtocolGuid + gEfiUgaDrawProtocolGuid + gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport + gEfiShellProtocolGuid [Pcd] gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress @@ -127,6 +132,11 @@ gPlatformModuleTokenSpaceGuid.PcdPBTNDisableInterval gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection gEfiBxtTokenSpaceGuid.PcdP2SBBaseAddress + gPlatformModuleTokenSpaceGuid.PcdLogoFileGuid + gPlatformModuleTokenSpaceGuid.PcdLogoDisplay + +[FeaturePcd] + gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport [Depex] gEfiPciRootBridgeIoProtocolGuid AND diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.dec b/Platform/BroxtonPlatformPkg/PlatformPkg.dec index f37ceafe3a..5d372b04b7 100644 --- a/Platform/BroxtonPlatformPkg/PlatformPkg.dec +++ b/Platform/BroxtonPlatformPkg/PlatformPkg.dec @@ -184,6 +184,8 @@ gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid|{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }|VOID*|0x80000014 ## This PCD used to enable or disable SueCreek gPlatformModuleTokenSpaceGuid.PcdSueCreek|FALSE|BOOLEAN|0x80000015 + ## This PCD used for QR code display under EFI Shell + gPlatformModuleTokenSpaceGuid.PcdLogoDisplay|FALSE|BOOLEAN|0x80000016 ## MemoryCheck value for checking memory before boot OS. ## To save the boot performance, the default MemoryCheck is set to 0. @@ -319,6 +321,7 @@ gPlatformModuleTokenSpaceGuid.PcdTemporaryRamSize|0x2000|UINT32|0x10001002 # @Prompt Stack size in the temporary RAM. gPlatformModuleTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0|UINT32|0x10001003 + gPlatformModuleTokenSpaceGuid.PcdLogoFileGuid|{0x1b, 0x9a, 0x3d, 0x71, 0x49, 0x88, 0x47, 0xc5, 0xb7, 0x2a, 0xb0, 0x7d, 0xc5, 0x10, 0x60, 0xc4 }|VOID*|0x10001004 [PcdsFixedAtBuild] ## Specifies maximum number of PPIs provided by SecCore. diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf index 1c1eb475f0..216cdea6bd 100644 --- a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf +++ b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf @@ -582,6 +582,9 @@ APRIORI DXE { FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { SECTION RAW = $(PLATFORM_PACKAGE_COMMON)/Binaries/Logo/Logo.bmp } + FILE FREEFORM = PCD(gPlatformModuleTokenSpaceGuid.PcdLogoFileGuid) { + SECTION RAW = $(PLATFORM_NAME)/Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp +} INF $(PLATFORM_PACKAGE_COMMON)/PnpDxe/PnpDxe.inf INF $(PLATFORM_PACKAGE_COMMON)/PlatformSettings/PlatformGpio/PlatformGpio.inf -- cgit v1.2.3