Add BootlogoOnly feature in BDS for BGRT

Signed-off-by: czhang46
Reviewed-by: li-elvin, hhtian


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13116 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 27 insertions, 6 deletions

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index efe881bf2f..6f06ac9a85 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -1,7 +1,7 @@
 /** @file

   BDS Lib functions which relate with create or process the boot option.

 

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -614,6 +614,7 @@ BdsLibBootViaBootOption (
   )

 {

   EFI_STATUS                Status;

+  EFI_STATUS                StatusLogo;

   EFI_HANDLE                Handle;

   EFI_HANDLE                ImageHandle;

   EFI_DEVICE_PATH_PROTOCOL  *FilePath;

@@ -621,6 +622,7 @@ BdsLibBootViaBootOption (
   EFI_DEVICE_PATH_PROTOCOL  *WorkingDevicePath;

   EFI_ACPI_S3_SAVE_PROTOCOL *AcpiS3Save;

   LIST_ENTRY                TempBootLists;

+  EFI_BOOT_LOGO_PROTOCOL    *BootLogo;

 

   //

   // Record the performance data for End of BDS

@@ -838,6 +840,15 @@ BdsLibBootViaBootOption (
 

 Done:

   //

+  // Set Logo status invalid after trying one boot option

+  //

+  BootLogo = NULL;

+  StatusLogo = gBS->LocateProtocol (&gEfiBootLogoProtocolGuid, NULL, (VOID **) &BootLogo);

+  if (!EFI_ERROR (StatusLogo) && (BootLogo != NULL)) {

+    BootLogo->SetBootLogo (BootLogo, NULL, 0, 0, 0, 0);

+  }

+

+  //

   // Clear Boot Current

   //

   gRT->SetVariable (

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
index cd3b37faf2..4fca0f3b12 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
@@ -1,7 +1,7 @@
 /** @file

   BDS Lib functions which contain all the code to connect console device

 

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "InternalBdsLib.h"

 #include <IndustryStandard/Bmp.h>

 

-#include <Protocol/BootLogo.h>

 

 /**

   Check if we need to save the EFI variable with "ConVarName" as name

@@ -896,7 +895,11 @@ EnableQuietBoot (
 

       CoordinateX = 0;

       CoordinateY = 0;

-      Attribute   = EfiBadgingDisplayAttributeCenter;

+      if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {

+        Attribute   = EfiBadgingDisplayAttributeCenter;

+      } else {

+        Attribute   = EfiBadgingDisplayAttributeCustomized;

+      } 

     }

 

     if (Blt != NULL) {

@@ -970,6 +973,11 @@ EnableQuietBoot (
       DestY = (SizeOfY - Height) / 2;

       break;

 

+    case EfiBadgingDisplayAttributeCustomized:

+      DestX = (SizeOfX - Width) / 2;

+      DestY = ((SizeOfY * 382) / 1000) - Height / 2;

+      break;

+

     default:

       DestX = CoordinateX;

       DestY = CoordinateY;

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index 5d3aa5fb6c..2d4a90f97d 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -5,7 +5,7 @@
 #  2) BDS boot device connect interface;

 #  3) BDS Misc interfaces for mainting boot variable, ouput string, etc.

 #  

-#  Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

 #  which accompanies this distribution.  The full text of the license may be found at

@@ -118,6 +118,7 @@
 

 [FeaturePcd]

   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootlogoOnlyEnable

 

 [Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index c674683dc8..28a6649347 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
@@ -1,7 +1,7 @@
 /** @file

   BDS library definition, include the file and data structure

 

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -41,6 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/HiiFont.h>

 #include <Protocol/HiiImage.h>

 #include <Protocol/UsbIo.h>

+#include <Protocol/BootLogo.h>

 

 #include <Guid/MemoryTypeInformation.h>

 #include <Guid/FileInfo.h>