Retire Logo and Shell guid header file, which are replaced by gEfiIntelFrameworkModul...

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

diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index 4c9b94bf3f7897f9bc4399d26c1f307e61ca1bdd..928b0f991f70d01913e261f49cc3b0d0890512dc 100644 (file)
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -117,7 +117,7 @@ INF  DuetPkg/BiosVideoThunkDxe/BiosVideo.inf
   # Binary INF file to support toggle among different CPU architectures.\r
 INF  FatBinPkg/EnhancedFatDxe/Fat.inf\r
 \r
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
   }\r
 \r

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
index 9f9283c99f720bc40a9ca8c62fd0f510cf6bc35a..d063faa61cc9d472ccf27ec05dfcbf76eebb1cb3 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
@@ -1139,7 +1139,7 @@ Returns:
   // from the graphic lib\r
   //\r
   if (QuietBoot) {\r
-    Status = EnableQuietBoot (&gEfiDefaultBmpLogoGuid);\r
+    Status = EnableQuietBoot (PcdGetPtr(PcdLogoFile));\r
     if (EFI_ERROR (Status)) {\r
       DisableQuietBoot ();\r
       return;\r

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
index 173f77bc1bd2f4f195322a0680f300c37ce887a1..82e78a95ee42c3429d2649e104a0f216eac2cbb6 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
@@ -45,7 +45,6 @@ Abstract:
 \r
 #include <Protocol/PciIo.h>\r
 \r
-#include <Guid/Logo.h>\r
 #include <Guid/Acpi.h>\r
 #include <Guid/SmBios.h>\r
 #include <Guid/Mps.h>\r

diff --git a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
index c8bffc0b8a2b7eab7bbfe3e721c2a657f067b36f..a2f762c00b1f3fa98684d06440824848d9c08611 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
+++ b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
@@ -63,4 +63,6 @@
   gEfiAcpiTableGuid\r
   \r
 [Pcd]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut  
\ No newline at end of file
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut  \r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile  \r
+  
\ No newline at end of file

diff --git a/IntelFrameworkModulePkg/Include/Guid/Logo.h b/IntelFrameworkModulePkg/Include/Guid/Logo.h
deleted file mode 100644 (file)
index 40c4353..0000000
--- a/IntelFrameworkModulePkg/Include/Guid/Logo.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/** @file\r
-  This file defines the File GUID for default BMP logo file.\r
-\r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef _LOGO_GUID_H__\r
-#define _LOGO_GUID_H__\r
-\r
-#define EFI_DEFAULT_BMP_LOGO_GUID \\r
-  {0x7BB28B99,0x61BB,0x11d5,{0x9A,0x5D,0x00,0x90,0x27,0x3F,0xC1,0x4D}}\r
-\r
-extern EFI_GUID gEfiDefaultBmpLogoGuid;\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/Include/Guid/ShellFile.h b/IntelFrameworkModulePkg/Include/Guid/ShellFile.h
deleted file mode 100644 (file)
index 91fb9d8..0000000
--- a/IntelFrameworkModulePkg/Include/Guid/ShellFile.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/** @file\r
-  This file defines File GUID for EFI Shell.\r
-\r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef _SHELLFILE_H_\r
-#define _SHELLFILE_H_\r
-\r
-#define EFI_SHELL_FILE_GUID  \\r
-  { 0xc57ad6b7, 0x0515, 0x40a8, {0x9d, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4e, 0x37 } }\r
-\r
-\r
-extern EFI_GUID gEfiShellFileGuid;\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 4e8e2c423f03688904b8ae5b84c4ab034087b33a..7e3349a5135051c7d01c8945e5b70ac88c846372 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -54,14 +54,6 @@
   ## Include/Guid/LzmaDecompress.h\r
   gLzmaCustomDecompressGuid      = { 0xEE4E5898, 0x3914, 0x4259, { 0x9D, 0x6E, 0xDC, 0x7B, 0xD7, 0x94, 0x03, 0xCF }}\r
 \r
-  ## Guid specify the default BMP logo file.\r
-  ## Include/Guid/Logo.h\r
-  gEfiDefaultBmpLogoGuid         = { 0x7BB28B99, 0x61BB, 0x11D5, { 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
-  \r
-  ## Guid specify the Shell application.\r
-  ## Include/Guid/ShellFile.h\r
-  gEfiShellFileGuid              = { 0xC57AD6B7, 0x0515, 0x40A8, { 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }}\r
-\r
   ## GUID used to pass DEBUG() macro information through the Status Code Protocol and Status Code PPI\r
   ## Include/Guid/StatusCodeDataTypeDebug.h\r
   gEfiStatusCodeDataTypeDebugGuid  = { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9 }}\r
@@ -136,6 +128,13 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusOnlySupportSlaveDma|FALSE|BOOLEAN|0x00010041\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportIsaMemory|TRUE|BOOLEAN|0x00010042\r
 \r
+[PcdsFixedAtBuild]\r
+  ## FFS filename to find the default BMP Logo file.\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile |{ 0x99, 0x8b, 0xB2, 0x7B, 0xBB, 0x61, 0xD5, 0x11, 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }|VOID*|16\r
+\r
+  ## FFS filename to find the shell application.\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }|VOID*|16\r
+\r
 [PcdsFixedAtBuild,PcdsPatchableInModule,PcdsDynamic]\r
   ## PcdStatusCodeMemorySize is used when PcdStatusCodeUseMemory is set to true\r
   #  (PcdStatusCodeMemorySize * KBytes) is the total taken memory size.\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 7fb6082fc858c1a571dd147a07112e85fcf0dfb6..a903ad08d6f2676c449a2397e5780040c3318bcf 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -220,7 +220,7 @@ BdsLibBootViaBootOption (
   //\r
   // If the boot option point to Internal FV shell, make sure it is valid\r
   //\r
-  Status = BdsLibUpdateFvFileDevicePath (&DevicePath, &gEfiShellFileGuid);\r
+  Status = BdsLibUpdateFvFileDevicePath (&DevicePath, PcdGetPtr(PcdShellFile));\r
   if (!EFI_ERROR(Status)) {\r
     if (Option->DevicePath != NULL) {\r
       FreePool(Option->DevicePath);\r
@@ -1147,7 +1147,7 @@ BdsLibEnumerateAllBootOption (
 \r
     Status = Fv->ReadFile (\r
                   Fv,\r
-                  &gEfiShellFileGuid,\r
+                  PcdGetPtr(PcdShellFile),\r
                   NULL,\r
                   &Size,\r
                   &Type,\r
@@ -1232,7 +1232,7 @@ BdsLibBuildOptionFromShell (
   //\r
   // Build the shell device path\r
   //\r
-  EfiInitializeFwVolDevicepathNode (&ShellNode, &gEfiShellFileGuid);\r
+  EfiInitializeFwVolDevicepathNode (&ShellNode, PcdGetPtr(PcdShellFile));\r
 \r
   DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &ShellNode);\r
 \r
@@ -1767,7 +1767,7 @@ BdsLibIsValidEFIBootOptDevicePathExt (
     // If the boot option point to Internal FV shell, make sure it is valid\r
     //\r
     TempDevicePath = DevPath; \r
-    Status = BdsLibUpdateFvFileDevicePath (&TempDevicePath, &gEfiShellFileGuid);\r
+    Status = BdsLibUpdateFvFileDevicePath (&TempDevicePath, PcdGetPtr(PcdShellFile));\r
     if (Status == EFI_ALREADY_STARTED) {\r
       return TRUE;\r
     } else {\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index d017c922fc45c5dfd759f52993e91e60039b28a2..acab4bda2f0d7c05f7d93ef735ecb23631c14641 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -74,7 +74,6 @@
   gEfiMemoryTypeInformationGuid                 ## CONSUMES ## GUID (The identifier of memory type information type in system table)\r
                                                 ## CONSUMES ## GUID HOB (The hob holding memory type information)\r
   gEfiVTUTF8Guid                                ## CONSUMES ## GUID (The type of terminal)\r
-  gEfiShellFileGuid                             ## CONSUMES ## GUID (Identify the shell file)\r
   gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootCurrent" (The boot option of current boot)\r
                                                 ## SOMETIMES_CONSUMES ## Variable:L"BootXX" (Boot option variable)\r
                                                 ## CONSUMES           ## Variable:L"Timeout" (The time out value in second of showing progress bar)\r
@@ -110,6 +109,8 @@
   gEfiHiiFontProtocolGuid                       # PROTOCOL CONSUMES\r
   gEfiSecurityArchProtocolGuid                  # PROTOCOL CONSUMES\r
 \r
-[FeaturePcd.common]\r
+[FeaturePcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r
 \r
+[Pcd]\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index a850743643b5e76a97799b9572b565da8c3cf3fd..14a68d8f24fca8d10d5b37d60575ef1367cf5c5c 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
@@ -45,7 +45,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/FileInfo.h>\r
 #include <Guid/GlobalVariable.h>\r
 #include <Guid/PcAnsi.h>\r
-#include <Guid/ShellFile.h>\r
 #include <Guid/Performance.h>\r
 \r
 #include <Library/PrintLib.h>\r

diff --git a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c
index 891492ff82aa0f12ea9b104ee5bc267a4c0aae73..34fd46ee59a034ff6b4f68841727fd2485620bfd 100644 (file)
--- a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c
+++ b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c
@@ -282,7 +282,7 @@ Returns:
   // from the graphic lib\r
   //\r
   if (QuietBoot) {\r
-    EnableQuietBoot (&gEfiDefaultBmpLogoGuid);\r
+    EnableQuietBoot (PcdGetPtr(PcdLogoFile));\r
     //\r
     // Perform system diagnostic\r
     //\r

diff --git a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h
index aa777deac2fa442c4360248e3acbcacbcf1c6b96..d9aafc8fcd945d83791bcfee297e076d9cf7cfc2 100644 (file)
--- a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h
+++ b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h
@@ -37,7 +37,6 @@ Abstract:
 \r
 #include <Protocol/WinNtThunk.h>\r
 #include <Protocol/WinNtIo.h>\r
-#include <Guid/Logo.h>\r
 #include <Guid/WinNtSystemConfig.h>\r
 \r
 extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r

diff --git a/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf b/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf
index 1284f4d06a85de2f4779cfaf008db7d7553a51f5..3708d679cb20049f30e0f59a4fdeb7c0b3bddb6b 100644 (file)
--- a/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf
+++ b/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf
@@ -54,13 +54,13 @@
   GenericBdsLib\r
 \r
 [Guids]\r
-  gEfiDefaultBmpLogoGuid\r
   gEfiWinNtSystemConfigGuid\r
 \r
 [Pcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
-  \r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile\r
+\r
 [Depex]\r
   gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid\r

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index d7427994c5b1ba0133283baa3ebb548a9e121c2f..d5945cf2bf3a704a30e275d4bffe71e0384d4043 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -210,8 +210,8 @@ INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
 INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
 INF  RuleOverride = TIANOCOMPRESSED MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 INF  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
-INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition\r
-INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf    ##This driver follows UEFI specification definition\r
+INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
+INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
 INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
 INF  Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf\r
 INF  Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf\r
@@ -240,19 +240,15 @@ INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
 # for binary shell, binary fat and logo module.\r
 #\r
 ################################################################################\r
-FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {\r
-    SECTION COMPRESS PI_STD {\r
-      SECTION GUIDED {\r
-        SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi\r
-      }\r
-    }\r
+FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {\r
+    SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi\r
   }\r
 \r
 FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {\r
     SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi\r
   }\r
 \r
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
   }\r
 \r

diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
index 1fa2aeb686f336ebf803b275dc564dc36c6ea65e..339d1e2f789470a7ae3d429a076cfa3eabf63925 100644 (file)
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -770,7 +770,7 @@ Returns:
   // from the graphic lib\r
   //\r
   if (QuietBoot) {\r
-    EnableQuietBoot (&gEfiDefaultBmpLogoGuid);\r
+    EnableQuietBoot (PcdGetPtr(PcdLogoFile));\r
     //\r
     // Perform system diagnostic\r
     //\r

diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
index bc71cc3484434693a6df61fe9eb9d864a2cde133..dc2851587882a3ce76c7eeeb1e9a021308c616c6 100644 (file)
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
@@ -50,14 +50,11 @@ Abstract:
 #include <Protocol/PciIo.h>\r
 #include <Protocol/FirmwareVolume2.h>\r
 \r
-#include <Guid/Logo.h>\r
 #include <Guid/Acpi.h>\r
 #include <Guid/SmBios.h>\r
 #include <Guid/Mps.h>\r
 #include <Guid/HobList.h>\r
-//#include <Guid/PciExpressBaseAddress.h>\r
 #include <Guid/GlobalVariable.h>\r
-#include <Guid/ShellFile.h>\r
 \r
 extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r
 extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformConnectSequence[];\r

diff --git a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
index caadd5be568462d6c2b44737f25862d9425e4100..1534ac8fc60c1fdaf9b2fae2e6a2e07286fcddb2 100644 (file)
--- a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
+++ b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
@@ -48,11 +48,9 @@
   GenericBdsLib\r
   PciLib\r
 \r
-[Guids]\r
-  gEfiDefaultBmpLogoGuid\r
-\r
 [Pcd.common]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile\r
 \r
 [Pcd.IA32, Pcd.X64]\r
   gEfiMdePkgTokenSpaceGuid.PcdFSBClock\r

diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf
index 84afe52811025bf1ba81c4af8d06ce30d419ba08..188c7b79f8955dafd7786312a56a83b3ed2e4619 100644 (file)
--- a/OvmfPkg/OvmfPkg.fdf
+++ b/OvmfPkg/OvmfPkg.fdf
@@ -154,7 +154,7 @@ INF  FatBinPkg/EnhancedFatDxe/Fat.inf
 \r
 INF  EdkShellBinPkg/FullShell/FullShell.inf\r
 \r
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { # LzmaCompress\r
       SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
     }\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 051a80f17d0313be74db1457fdb8f3b90fb0da8c..66576bff00e81cef32ec2d825190536b303a5e8f 100644 (file)
--- 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\r
   }\r
 \r
-FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {\r
+FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {\r
     SECTION PE32 = EdkShellBinPkg/FullShell/X64/Shell_full.efi\r
   }\r
 \r
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { # LzmaCompress\r
       SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
     }\r

diff --git a/UnixPkg/Library/UnixBdsLib/BdsPlatform.c b/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
index cbbfc4e2273a176be0ac608fd8133329c458f7c2..bac2cfd6cc57ce579cec157e9de3a74d9c944ab6 100644 (file)
--- a/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
+++ b/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
@@ -281,7 +281,7 @@ Returns:
   // from the graphic lib\r
   //\r
   if (QuietBoot) {\r
-    EnableQuietBoot (&gEfiDefaultBmpLogoGuid);\r
+    EnableQuietBoot (PcdGetPtr(PcdLogoFile));\r
     //\r
     // Perform system diagnostic\r
     //\r

diff --git a/UnixPkg/Library/UnixBdsLib/BdsPlatform.h b/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
index 4fd8bf181b42c4d74fcd53f0ca0faa58d0a93d53..3f853152d0c55915d388f9d6c72e9fe7eb2dee7f 100644 (file)
--- a/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
+++ b/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
@@ -37,7 +37,6 @@ Abstract:
 \r
 #include <Protocol/UnixThunk.h>\r
 #include <Protocol/UnixIo.h>\r
-#include <Guid/Logo.h>\r
 #include <Guid/UnixSystemConfig.h>\r
 \r
 extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r

diff --git a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
index 10a2631a5e7a7abbeaa58d10a5a2d0f4b4e46a88..1a5604d8f21d0468dad4ba0b45aae553a47845b7 100644 (file)
--- a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
+++ b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
@@ -55,13 +55,13 @@
 \r
 \r
 [Guids]\r
-  gEfiDefaultBmpLogoGuid                        # ALWAYS_CONSUMED
   gEfiUnixSystemConfigGuid\r
 \r
 [Pcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile\r
   \r
 [Depex]\r
   gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid\r

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index cff698479fc97ae5b7f5f34d326b6ad708a9be3a..bae66cdd4ab1a8cbe1e67fb0a9daf70aa5b93ceb 100644 (file)
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -247,13 +247,14 @@ INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 # for binary shell, binary fat and logo module.\r
 #  \r
 ################################################################################\r
-FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {\r
+FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {\r
     SECTION COMPRESS PI_STD {\r
       SECTION GUIDED {\r
         SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi\r
       }\r
     }\r
   }\r
+\r
 FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {\r
     SECTION COMPRESS PI_STD {\r
       SECTION GUIDED {\r
@@ -261,7 +262,8 @@ FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
       }\r
     }\r
   }\r
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
+\r
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION COMPRESS PI_STD {\r
       SECTION GUIDED {\r
         SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r