Retire Logo and Shell guid header file, which are replaced by gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile and gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile

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

5 files changed, 5 insertions, 10 deletions

diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
index 1fa2aeb686..339d1e2f78 100644
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -770,7 +770,7 @@ Returns:
   // from the graphic lib

   //

   if (QuietBoot) {

-    EnableQuietBoot (&gEfiDefaultBmpLogoGuid);

+    EnableQuietBoot (PcdGetPtr(PcdLogoFile));

     //

     // Perform system diagnostic

     //

diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
index bc71cc3484..dc28515878 100644
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
@@ -50,14 +50,11 @@ Abstract:
 #include <Protocol/PciIo.h>

 #include <Protocol/FirmwareVolume2.h>

 

-#include <Guid/Logo.h>

 #include <Guid/Acpi.h>

 #include <Guid/SmBios.h>

 #include <Guid/Mps.h>

 #include <Guid/HobList.h>

-//#include <Guid/PciExpressBaseAddress.h>

 #include <Guid/GlobalVariable.h>

-#include <Guid/ShellFile.h>

 

 extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];

 extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformConnectSequence[];

diff --git a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
index caadd5be56..1534ac8fc6 100644
--- a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
+++ b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
@@ -48,11 +48,9 @@
   GenericBdsLib

   PciLib

 

-[Guids]

-  gEfiDefaultBmpLogoGuid

-

 [Pcd.common]

   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile

 

 [Pcd.IA32, Pcd.X64]

   gEfiMdePkgTokenSpaceGuid.PcdFSBClock

diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf
index 84afe52811..188c7b79f8 100644
--- a/OvmfPkg/OvmfPkg.fdf
+++ b/OvmfPkg/OvmfPkg.fdf
@@ -154,7 +154,7 @@ INF  FatBinPkg/EnhancedFatDxe/Fat.inf
 

 INF  EdkShellBinPkg/FullShell/FullShell.inf

 

-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {

+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {

     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { # LzmaCompress

       SECTION RAW = MdeModulePkg/Logo/Logo.bmp

     }

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 051a80f17d..66576bff00 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -154,11 +154,11 @@ FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
     SECTION PE32 = FatBinPkg/EnhancedFatDxe/X64/Fat.efi

   }

 

-FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {

+FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {

     SECTION PE32 = EdkShellBinPkg/FullShell/X64/Shell_full.efi

   }

 

-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {

+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {

     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { # LzmaCompress

       SECTION RAW = MdeModulePkg/Logo/Logo.bmp

     }