From nobody Wed Dec 25 12:53:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1507791404540842.381150165985; Wed, 11 Oct 2017 23:56:44 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E493C21F3C1B1; Wed, 11 Oct 2017 23:53:10 -0700 (PDT) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0D6B42095E51F for ; Wed, 11 Oct 2017 23:53:08 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Oct 2017 23:56:38 -0700 Received: from xianhu2x-mobl.ccr.corp.intel.com ([10.239.197.216]) by fmsmga002.fm.intel.com with ESMTP; 11 Oct 2017 23:56:38 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=xianhuix.liu@intel.com; receiver=edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,364,1503385200"; d="scan'208";a="1229905903" From: xianhu2x To: edk2-devel@lists.01.org Date: Thu, 12 Oct 2017 14:52:57 +0800 Message-Id: <20171012065257.12672-1-xianhuix.liu@intel.com> X-Mailer: git-send-email 2.14.1.windows.1 Subject: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] QR code display under EFI Shell X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: zwei4 =20 --- .../MinnowBoard3/BoardInitPostMem/BoardInit.c | 5 + .../BoardInitPostMem/BoardInitPostMem.inf | 1 + .../Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp | Bin 0 -> 54670 bytes .../Common/PlatformSettings/PlatformDxe/Logo.c | 520 +++++++++++++++++= ++++ .../Common/PlatformSettings/PlatformDxe/Logo.h | 27 ++ .../Common/PlatformSettings/PlatformDxe/Platform.c | 21 +- .../PlatformSettings/PlatformDxe/PlatformDxe.inf | 10 + Platform/BroxtonPlatformPkg/PlatformPkg.dec | 3 + Platform/BroxtonPlatformPkg/PlatformPkg.fdf | 3 + 9 files changed, 589 insertions(+), 1 deletion(-) create mode 100644 Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Logo/Min= nowBoardLogo.bmp create mode 100644 Platform/BroxtonPlatformPkg/Common/PlatformSettings/Pla= tformDxe/Logo.c create mode 100644 Platform/BroxtonPlatformPkg/Common/PlatformSettings/Pla= tformDxe/Logo.h diff --git Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/= BoardInit.c Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem= /BoardInit.c index 0aa9246f4..fc8250fd3 100644 --- Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardIn= it.c +++ Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardIn= it.c @@ -101,6 +101,11 @@ MinnowBoard3PostMemInitCallback ( // Set PcdSueCreek // PcdSetBool (PcdSueCreek, FALSE); + + // + //Set PcdLogoDisplay + // + PcdSetBool (PcdLogoDisplay, TRUE); =20 // // Add init steps here diff --git Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/= BoardInitPostMem.inf Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardIn= itPostMem/BoardInitPostMem.inf index 8fa5ffa64..7651103d1 100644 --- Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardIn= itPostMem.inf +++ Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardIn= itPostMem.inf @@ -60,6 +60,7 @@ gPlatformModuleTokenSpaceGuid.PcdResetType gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid gPlatformModuleTokenSpaceGuid.PcdSueCreek + gPlatformModuleTokenSpaceGuid.PcdLogoDisplay =20 [Guids] gEfiPlatformInfoGuid diff --git Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Logo/MinnowBoardL= ogo.bmp Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Logo/MinnowBoardLogo= .bmp new file mode 100644 index 0000000000000000000000000000000000000000..7d7796e18777e34b802728bfe8a= c7815da05256e GIT binary patch literal 54670 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 tyOpI4_kE`0xt+7`^L8ss8}9o|$8$Sp-{ + + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "Logo.h" + + +/** + Convert a *.BMP graphics image to a GOP blt buffer. If a NULL Blt buffer + is passed in a GopBlt buffer will be allocated by this routine. If a Gop= Blt + buffer is passed in it will be used if it is big enough. + + @param BmpImage Pointer to BMP file + @param BmpImageSize Number of bytes in BmpImage + @param GopBlt Buffer containing GOP version of BmpImage. + @param GopBltSize Size of GopBlt in bytes. + @param PixelHeight Height of GopBlt/BmpImage in pixels + @param PixelWidth Width of GopBlt/BmpImage in pixels + + @retval EFI_SUCCESS GopBlt and GopBltSize are returned. + @retval EFI_UNSUPPORTED BmpImage is not a valid *.BMP image + @retval EFI_BUFFER_TOO_SMALL The passed in GopBlt buffer is not big eno= ugh. + GopBltSize will contain the required s= ize. + @retval EFI_OUT_OF_RESOURCES No enough buffer to allocate. + +**/ +EFI_STATUS +EfiShellConvertBmpToGopBlt ( + IN VOID *BmpImage, + IN UINTN BmpImageSize, + IN OUT VOID **GopBlt, + IN OUT UINTN *GopBltSize, + OUT UINTN *PixelHeight, + OUT UINTN *PixelWidth + ) +{ + UINT8 *Image; + UINT8 *ImageHeader; + BMP_IMAGE_HEADER *BmpHeader; + BMP_COLOR_MAP *BmpColorMap; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt; + UINT64 BltBufferSize; + UINTN Index; + UINTN Height; + UINTN Width; + UINTN ImageIndex; + UINT32 DataSizePerLine; + BOOLEAN IsAllocated; + UINT32 ColorMapNum; + + if (sizeof (BMP_IMAGE_HEADER) > BmpImageSize) { + return EFI_INVALID_PARAMETER; + } + +BmpHeader =3D (BMP_IMAGE_HEADER *) BmpImage; + +if (BmpHeader->CharB !=3D 'B' || BmpHeader->CharM !=3D 'M') { + return EFI_UNSUPPORTED; +} + +// +// Doesn't support compress. +// +if (BmpHeader->CompressionType !=3D 0) { + return EFI_UNSUPPORTED; +} + +// +// Only support BITMAPINFOHEADER format. +// BITMAPFILEHEADER + BITMAPINFOHEADER =3D BMP_IMAGE_HEADER +// +if (BmpHeader->HeaderSize !=3D sizeof (BMP_IMAGE_HEADER) - OFFSET_OF(BMP_I= MAGE_HEADER, HeaderSize)) { + return EFI_UNSUPPORTED; +} + +// +// The data size in each line must be 4 byte alignment. +// +DataSizePerLine =3D ((BmpHeader->PixelWidth * BmpHeader->BitPerPixel + 31)= >> 3) & (~0x3); +BltBufferSize =3D MultU64x32 (DataSizePerLine, BmpHeader->PixelHeight); +if (BltBufferSize > (UINT32) ~0) { + return EFI_INVALID_PARAMETER; +} + +if ((BmpHeader->Size !=3D BmpImageSize) ||=20 + (BmpHeader->Size < BmpHeader->ImageOffset) || + (BmpHeader->Size - BmpHeader->ImageOffset !=3D BmpHeader->PixelHeight = * DataSizePerLine)) { + return EFI_INVALID_PARAMETER; +} + +// +// Calculate Color Map offset in the image. +// +Image =3D BmpImage; +BmpColorMap =3D (BMP_COLOR_MAP *) (Image + sizeof (BMP_IMAGE_HEADER)); +if (BmpHeader->ImageOffset < sizeof (BMP_IMAGE_HEADER)) { + return EFI_INVALID_PARAMETER; +} + +if (BmpHeader->ImageOffset > sizeof (BMP_IMAGE_HEADER)) { + switch (BmpHeader->BitPerPixel) { + case 1: + ColorMapNum =3D 2; + break; + case 4: + ColorMapNum =3D 16; + break; + case 8: + ColorMapNum =3D 256; + break; + default: + ColorMapNum =3D 0; + break; + } + // + // BMP file may has padding data between the bmp header section and the = bmp data section. + // + if (BmpHeader->ImageOffset - sizeof (BMP_IMAGE_HEADER) < sizeof (BMP_COL= OR_MAP) * ColorMapNum) { + return EFI_INVALID_PARAMETER; + } + } + + // + // Calculate graphics image data address in the image + // + Image =3D ((UINT8 *) BmpImage) + BmpHeader->ImageOffset; + ImageHeader =3D Image; + + // + // Calculate the BltBuffer needed size. + // + BltBufferSize =3D MultU64x32 ((UINT64) BmpHeader->PixelWidth, BmpHeader->= PixelHeight); + // + // Ensure the BltBufferSize * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) does= n't overflow + // + if (BltBufferSize > DivU64x32 ((UINTN) ~0, sizeof (EFI_GRAPHICS_OUTPUT_BL= T_PIXEL))) { + return EFI_UNSUPPORTED; + } + BltBufferSize =3D MultU64x32 (BltBufferSize, sizeof (EFI_GRAPHICS_OUTPUT_= BLT_PIXEL)); + + IsAllocated =3D FALSE; + if (*GopBlt =3D=3D NULL) { + // + // GopBlt is not allocated by caller. + // + *GopBltSize =3D (UINTN) BltBufferSize; + *GopBlt =3D AllocatePool (*GopBltSize); + IsAllocated =3D TRUE; + if (*GopBlt =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + } else { + // + // GopBlt has been allocated by caller. + // + if (*GopBltSize < (UINTN) BltBufferSize) { + *GopBltSize =3D (UINTN) BltBufferSize; + return EFI_BUFFER_TOO_SMALL; + } + } + + *PixelWidth =3D BmpHeader->PixelWidth; + *PixelHeight =3D BmpHeader->PixelHeight; + + // + // Convert image from BMP to Blt buffer format + // + BltBuffer =3D *GopBlt; + for (Height =3D 0; Height < BmpHeader->PixelHeight; Height++) { + Blt =3D &BltBuffer[(BmpHeader->PixelHeight - Height - 1) * BmpHeader->P= ixelWidth]; + for (Width =3D 0; Width < BmpHeader->PixelWidth; Width++, Image++, Blt+= +) { + switch (BmpHeader->BitPerPixel) { + case 1: + // + // Convert 1-bit (2 colors) BMP to 24-bit color + // + for (Index =3D 0; Index < 8 && Width < BmpHeader->PixelWidth; Index= ++) { + Blt->Red =3D BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Red; + Blt->Green =3D BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Gree= n; + Blt->Blue =3D BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Blue; + Blt++; + Width++; + } + =20 + Blt--; + Width--; + break; + + case 4: + // + // Convert 4-bit (16 colors) BMP Palette to 24-bit color + // + Index =3D (*Image) >> 4; + Blt->Red =3D BmpColorMap[Index].Red; + Blt->Green =3D BmpColorMap[Index].Green; + Blt->Blue =3D BmpColorMap[Index].Blue; + if (Width < (BmpHeader->PixelWidth - 1)) { + Blt++; + Width++; + Index =3D (*Image) & 0x0f; + Blt->Red =3D BmpColorMap[Index].Red; + Blt->Green =3D BmpColorMap[Index].Green; + Blt->Blue =3D BmpColorMap[Index].Blue; + } + break; + + case 8: + // + // Convert 8-bit (256 colors) BMP Palette to 24-bit color + // + Blt->Red =3D BmpColorMap[*Image].Red; + Blt->Green =3D BmpColorMap[*Image].Green; + Blt->Blue =3D BmpColorMap[*Image].Blue; + break; + + case 24: + // + // It is 24-bit BMP. + // + Blt->Blue =3D *Image++; + Blt->Green =3D *Image++; + Blt->Red =3D *Image; + break; + + default: + // + // Other bit format BMP is not supported. + // + if (IsAllocated) { + FreePool (*GopBlt); + *GopBlt =3D NULL; + } + return EFI_UNSUPPORTED; + }; + + } + + ImageIndex =3D (UINTN)Image - (UINTN)ImageHeader; + if ((ImageIndex % 4) !=3D 0) { + // + // Bmp Image starts each row on a 32-bit boundary! + // + Image =3D Image + (4 - (ImageIndex % 4)); + } + } + + return EFI_SUCCESS; +} + + +EFI_STATUS +EFIAPI +WelcomeLineDisplay ( + IN CHAR16 * WelcomeLine + )=20 +{ + UINTN Length; + UINTN Line; + UINTN Columns; + UINTN Rows; + UINTN Column; + EFI_STATUS Status; + EFI_SIMPLE_TEXT_OUTPUT_MODE SavedConMode; + + Length =3D StrLen(WelcomeLine); + Line =3D 1; + CopyMem(&SavedConMode, gST->ConOut->Mode, sizeof (SavedConMode)); + gST->ConOut->QueryMode(gST->ConOut, SavedConMode.Mode, &Columns, &Rows); + Column =3D (Columns-Length)/2; + gST->ConOut->SetAttribute(gST->ConOut, EFI_YELLOW); + gST->ConOut->SetCursorPosition(gST->ConOut, Column, SavedConMode.CursorR= ow); + gST->ConOut->OutputString(gST->ConOut, WelcomeLine); + gST->ConOut->EnableCursor (gST->ConOut, SavedConMode.CursorVisible); + gST->ConOut->SetCursorPosition (gST->ConOut, SavedConMode.CursorColumn, = (SavedConMode.CursorRow+1)); + Status =3D gST->ConOut->SetAttribute (gST->ConOut, SavedConMode.Attr= ibute); + return Status; +} + +EFI_STATUS +EFIAPI +LogoDisplay ( + IN EFI_GUID *LogoFile + ) +{ + EFI_STATUS Status; + UINT32 SizeOfX; + UINT32 SizeOfY; + INTN DestX; + INTN DestY; + UINT8 *ImageData; + UINTN ImageSize; + UINTN BltSize; + EFI_BADGING_DISPLAY_ATTRIBUTE Attribute; + UINTN CoordinateX; + UINTN CoordinateY; + UINTN Height; + UINTN Width; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt; + EFI_UGA_DRAW_PROTOCOL *UgaDraw; + UINT32 ColorDepth; + UINT32 RefreshRate; + EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; + UINTN LogoDestX; + UINTN LogoDestY; + UINTN LogoHeight; + UINTN LogoWidth; + =20 + UgaDraw =3D NULL; + // + // Try to open GOP first + // + Status =3D gBS->LocateProtocol (&gEfiGraphicsOutputProtocolGuid, NULL, (= VOID **) &GraphicsOutput); + if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) { + GraphicsOutput =3D NULL; + // + // Open GOP failed, try to open UGA + // + Status =3D gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawPro= tocolGuid, (VOID **) &UgaDraw); + } + if (EFI_ERROR (Status)) { + return EFI_UNSUPPORTED; + } + + // + // Try to open Boot Logo Protocol. + // + + if (GraphicsOutput !=3D NULL) { + SizeOfX =3D GraphicsOutput->Mode->Info->HorizontalResolution; + SizeOfY =3D GraphicsOutput->Mode->Info->VerticalResolution; + + } else if (UgaDraw !=3D NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { + Status =3D UgaDraw->GetMode (UgaDraw, &SizeOfX, &SizeOfY, &ColorDepth,= &RefreshRate); + if (EFI_ERROR (Status)) { + return EFI_UNSUPPORTED; + } + } else { + return EFI_UNSUPPORTED; + } + + Blt =3D NULL; + LogoDestX =3D 0; + LogoDestY =3D 0; + LogoHeight =3D 0; + LogoWidth =3D 0; + =20 + ImageData =3D NULL; + ImageSize =3D 0; + + // + // Get the specified image from FV. + // + Status =3D GetSectionFromAnyFv (LogoFile, EFI_SECTION_RAW, 0, (VOID **) = &ImageData, &ImageSize); + if (EFI_ERROR (Status)) { + return EFI_UNSUPPORTED; + } + + CoordinateX =3D 0; + CoordinateY =3D 0; + Attribute =3D EfiBadgingDisplayAttributeRightTop; + + if (Blt !=3D NULL) { + FreePool (Blt); + } + + // + // Try BMP decoder + // + Blt =3D NULL; + Status =3D EfiShellConvertBmpToGopBlt ( + ImageData, + ImageSize, + (VOID **) &Blt, + &BltSize, + &Height, + &Width + ); + + if (EFI_ERROR (Status)) { + FreePool (ImageData); + } + + // + // Calculate the display position according to Attribute. + // + switch (Attribute) { + case EfiBadgingDisplayAttributeLeftTop: + DestX =3D CoordinateX; + DestY =3D CoordinateY; + break; + + case EfiBadgingDisplayAttributeCenterTop: + DestX =3D (SizeOfX - Width) / 2; + DestY =3D CoordinateY; + break; + + case EfiBadgingDisplayAttributeRightTop: + DestX =3D (SizeOfX - Width - CoordinateX); + DestY =3D CoordinateY;; + break; + + case EfiBadgingDisplayAttributeCenterRight: + DestX =3D (SizeOfX - Width - CoordinateX); + DestY =3D (SizeOfY - Height) / 2; + break; + + case EfiBadgingDisplayAttributeRightBottom: + DestX =3D (SizeOfX - Width - CoordinateX); + DestY =3D (SizeOfY - Height - CoordinateY); + break; + + case EfiBadgingDisplayAttributeCenterBottom: + DestX =3D (SizeOfX - Width) / 2; + DestY =3D (SizeOfY - Height - CoordinateY); + break; + + case EfiBadgingDisplayAttributeLeftBottom: + DestX =3D CoordinateX; + DestY =3D (SizeOfY - Height - CoordinateY); + break; + + case EfiBadgingDisplayAttributeCenterLeft: + DestX =3D CoordinateX; + DestY =3D (SizeOfY - Height) / 2; + break; + + case EfiBadgingDisplayAttributeCenter: + DestX =3D (SizeOfX - Width) / 2; + DestY =3D (SizeOfY - Height) / 2; + break; + + default: + DestX =3D CoordinateX; + DestY =3D CoordinateY; + break; + } + + if ((DestX >=3D 0) && (DestY >=3D 0)) { + if (GraphicsOutput !=3D NULL) { + Status =3D GraphicsOutput->Blt ( + GraphicsOutput, + Blt, + EfiBltBufferToVideo, + 0, + 0, + (UINTN) DestX, + (UINTN) DestY, + Width, + Height, + Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_P= IXEL) + ); + } else if (UgaDraw !=3D NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { + Status =3D UgaDraw->Blt ( + UgaDraw, + (EFI_UGA_PIXEL *) Blt, + EfiUgaBltBufferToVideo, + 0, + 0, + (UINTN) DestX, + (UINTN) DestY, + Width, + Height, + Width * sizeof (EFI_UGA_PIXEL) + ); + } else { + Status =3D EFI_UNSUPPORTED; + } + + } + + FreePool (ImageData); + + FreePool (Blt); + + return Status; + } + + +VOID +EFIAPI +EfiShellProtocolCallback ( + IN EFI_EVENT Event, + IN VOID *Context +) +{ + CHAR16 *Welcome; + Welcome =3D L"Welcome to https://minnowboard.org/setup"; + WelcomeLineDisplay(Welcome); + LogoDisplay(PcdGetPtr (PcdLogoFileGuid)); + return; +} + diff --git Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/= Logo.h Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Logo= .h new file mode 100644 index 000000000..62cb1e588 --- /dev/null +++ Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Logo.h @@ -0,0 +1,27 @@ +/** @file + Driver configuration include file. + + Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#ifndef _LOGO_H +#define _LOGO_H + +VOID +EFIAPI +EfiShellProtocolCallback ( + IN EFI_EVENT Event, + IN VOID *Context +); + +#endif // #ifndef _CONFIGURATION_H + diff --git Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/= Platform.c Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/= Platform.c index a6d251ded..87268e8fd 100644 --- Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platfor= m.c +++ Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platfor= m.c @@ -15,6 +15,7 @@ =20 #include "PlatformDxe.h" #include "Platform.h" +#include "Logo.h" =20 #include #include @@ -254,7 +255,6 @@ EnableAcpiCallback ( IoWrite16 (AcpiBaseAddr + R_ACPI_PM1_CNT, Pm1Cnt); } =20 - VOID PlatformScInitBeforeBoot ( VOID @@ -699,6 +699,8 @@ InitializePlatform ( EFI_HOB_GUID_TYPE *FdoEnabledGuidHob =3D NULL; EFI_PLATFORM_INFO_HOB *PlatformInfoHob; EFI_PEI_HOB_POINTERS Hob; + EFI_EVENT EfiShellEvent =3D NULL; + VOID *mEfiShellProtocolRegistration; =20 mImageHandle =3D ImageHandle; =20 @@ -900,6 +902,23 @@ InitializePlatform ( =20 OverrideSdCardPresence(); =20 + // + //QR code showing under EFI Shell + // + if (PcdGetBool(PcdLogoDisplay)) { + Status =3D gBS->CreateEvent ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + EfiShellProtocolCallback, + NULL, + &EfiShellEvent + ); + Status =3D gBS->RegisterProtocolNotify ( + &gEfiShellProtocolGuid, + EfiShellEvent, + &mEfiShellProtocolRegistration + ); + } return EFI_SUCCESS; } =20 diff --git Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/= PlatformDxe.inf Platform/BroxtonPlatformPkg/Common/PlatformSettings/Platfor= mDxe/PlatformDxe.inf index ee8fd5a68..b98d32c73 100644 --- Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platfor= mDxe.inf +++ Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platfor= mDxe.inf @@ -34,6 +34,7 @@ IchTcoReset.c SensorVar.c Rtc.c + Logo.c =20 [Packages] MdePkg/MdePkg.dec @@ -66,6 +67,7 @@ DxeSaPolicyLib ConfigBlockLib GpioLib + DxeServicesLib =20 [Guids] gEfiBiosIdGuid @@ -116,6 +118,9 @@ gDxePlatformTdtPolicyGuid gDxePlatformSeCPolicyGuid gEfiSeCOperationProtocolGuid + gEfiUgaDrawProtocolGuid + gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport + gEfiShellProtocolGuid =20 [Pcd] gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress @@ -127,6 +132,11 @@ gPlatformModuleTokenSpaceGuid.PcdPBTNDisableInterval gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection gEfiBxtTokenSpaceGuid.PcdP2SBBaseAddress + gPlatformModuleTokenSpaceGuid.PcdLogoFileGuid + gPlatformModuleTokenSpaceGuid.PcdLogoDisplay + +[FeaturePcd] + gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport =20 [Depex] gEfiPciRootBridgeIoProtocolGuid AND diff --git Platform/BroxtonPlatformPkg/PlatformPkg.dec Platform/BroxtonPlat= formPkg/PlatformPkg.dec index f37ceafe3..52c05d976 100644 --- Platform/BroxtonPlatformPkg/PlatformPkg.dec +++ Platform/BroxtonPlatformPkg/PlatformPkg.dec @@ -184,6 +184,8 @@ gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid|{ 0x00, 0x00, 0x00, 0x= 00, 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 =20 ## 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|0x100010= 02 # @Prompt Stack size in the temporary RAM. gPlatformModuleTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0|UINT32|0x100= 01003 + gPlatformModuleTokenSpaceGuid.PcdLogoFileGuid|{0x1b, 0x9a, 0x3d, 0x71, 0= x49, 0x88, 0x47, 0xc5, 0xb7, 0x2a, 0xb0, 0x7d, 0xc5, 0x10, 0x60, 0xc4 }|VOI= D*|0x10001004 =20 [PcdsFixedAtBuild] ## Specifies maximum number of PPIs provided by SecCore. diff --git Platform/BroxtonPlatformPkg/PlatformPkg.fdf Platform/BroxtonPlat= formPkg/PlatformPkg.fdf index 1c1eb475f..32c389268 100644 --- Platform/BroxtonPlatformPkg/PlatformPkg.fdf +++ Platform/BroxtonPlatformPkg/PlatformPkg.fdf @@ -582,6 +582,9 @@ APRIORI DXE { FILE FREEFORM =3D PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoF= ile) { SECTION RAW =3D $(PLATFORM_PACKAGE_COMMON)/Binaries/Logo/Logo.bmp } + FILE FREEFORM =3D PCD(gPlatformModuleTokenSpaceGuid.PcdLogoFileGuid) { + SECTION RAW =3D $(PLATFORM_NAME)/Board/MinnowBoard3/Logo/MinnowBoardLogo= .bmp +} =20 INF $(PLATFORM_PACKAGE_COMMON)/PnpDxe/PnpDxe.inf INF $(PLATFORM_PACKAGE_COMMON)/PlatformSettings/PlatformGpio/PlatformGpi= o.inf --=20 2.14.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel