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

6 files changed, 14 insertions, 62 deletions

diff --git a/IntelFrameworkModulePkg/Include/Guid/Logo.h b/IntelFrameworkModulePkg/Include/Guid/Logo.h
deleted file mode 100644
index 40c4353919..0000000000
--- a/IntelFrameworkModulePkg/Include/Guid/Logo.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/** @file

-  This file defines the File GUID for default BMP logo file.

-

-Copyright (c) 2006 - 2008, Intel Corporation. <BR>

-All rights reserved. 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

-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 IMPLIED.

-

-**/

-

-#ifndef _LOGO_GUID_H__

-#define _LOGO_GUID_H__

-

-#define EFI_DEFAULT_BMP_LOGO_GUID \

-  {0x7BB28B99,0x61BB,0x11d5,{0x9A,0x5D,0x00,0x90,0x27,0x3F,0xC1,0x4D}}

-

-extern EFI_GUID gEfiDefaultBmpLogoGuid;

-

-#endif

diff --git a/IntelFrameworkModulePkg/Include/Guid/ShellFile.h b/IntelFrameworkModulePkg/Include/Guid/ShellFile.h
deleted file mode 100644
index 91fb9d852d..0000000000
--- a/IntelFrameworkModulePkg/Include/Guid/ShellFile.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/** @file

-  This file defines File GUID for EFI Shell.

-

-Copyright (c) 2006 - 2008, Intel Corporation. <BR>

-All rights reserved. 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

-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 IMPLIED.

-

-**/

-

-#ifndef _SHELLFILE_H_

-#define _SHELLFILE_H_

-

-#define EFI_SHELL_FILE_GUID  \

-  { 0xc57ad6b7, 0x0515, 0x40a8, {0x9d, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4e, 0x37 } }

-

-

-extern EFI_GUID gEfiShellFileGuid;

-

-#endif

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 4e8e2c423f..7e3349a513 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -54,14 +54,6 @@
   ## Include/Guid/LzmaDecompress.h

   gLzmaCustomDecompressGuid      = { 0xEE4E5898, 0x3914, 0x4259, { 0x9D, 0x6E, 0xDC, 0x7B, 0xD7, 0x94, 0x03, 0xCF }}

 

-  ## Guid specify the default BMP logo file.

-  ## Include/Guid/Logo.h

-  gEfiDefaultBmpLogoGuid         = { 0x7BB28B99, 0x61BB, 0x11D5, { 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}

-  

-  ## Guid specify the Shell application.

-  ## Include/Guid/ShellFile.h

-  gEfiShellFileGuid              = { 0xC57AD6B7, 0x0515, 0x40A8, { 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }}

-

   ## GUID used to pass DEBUG() macro information through the Status Code Protocol and Status Code PPI

   ## Include/Guid/StatusCodeDataTypeDebug.h

   gEfiStatusCodeDataTypeDebugGuid  = { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9 }}

@@ -136,6 +128,13 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusOnlySupportSlaveDma|FALSE|BOOLEAN|0x00010041

   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportIsaMemory|TRUE|BOOLEAN|0x00010042

 

+[PcdsFixedAtBuild]

+  ## FFS filename to find the default BMP Logo file.

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile |{ 0x99, 0x8b, 0xB2, 0x7B, 0xBB, 0x61, 0xD5, 0x11, 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }|VOID*|16

+

+  ## FFS filename to find the shell application.

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }|VOID*|16

+

 [PcdsFixedAtBuild,PcdsPatchableInModule,PcdsDynamic]

   ## PcdStatusCodeMemorySize is used when PcdStatusCodeUseMemory is set to true

   #  (PcdStatusCodeMemorySize * KBytes) is the total taken memory size.

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 7fb6082fc8..a903ad08d6 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -220,7 +220,7 @@ BdsLibBootViaBootOption (
   //

   // If the boot option point to Internal FV shell, make sure it is valid

   //

-  Status = BdsLibUpdateFvFileDevicePath (&DevicePath, &gEfiShellFileGuid);

+  Status = BdsLibUpdateFvFileDevicePath (&DevicePath, PcdGetPtr(PcdShellFile));

   if (!EFI_ERROR(Status)) {

     if (Option->DevicePath != NULL) {

       FreePool(Option->DevicePath);

@@ -1147,7 +1147,7 @@ BdsLibEnumerateAllBootOption (
 

     Status = Fv->ReadFile (

                   Fv,

-                  &gEfiShellFileGuid,

+                  PcdGetPtr(PcdShellFile),

                   NULL,

                   &Size,

                   &Type,

@@ -1232,7 +1232,7 @@ BdsLibBuildOptionFromShell (
   //

   // Build the shell device path

   //

-  EfiInitializeFwVolDevicepathNode (&ShellNode, &gEfiShellFileGuid);

+  EfiInitializeFwVolDevicepathNode (&ShellNode, PcdGetPtr(PcdShellFile));

 

   DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &ShellNode);

 

@@ -1767,7 +1767,7 @@ BdsLibIsValidEFIBootOptDevicePathExt (
     // If the boot option point to Internal FV shell, make sure it is valid

     //

     TempDevicePath = DevPath; 

-    Status = BdsLibUpdateFvFileDevicePath (&TempDevicePath, &gEfiShellFileGuid);

+    Status = BdsLibUpdateFvFileDevicePath (&TempDevicePath, PcdGetPtr(PcdShellFile));

     if (Status == EFI_ALREADY_STARTED) {

       return TRUE;

     } else {

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index d017c922fc..acab4bda2f 100644
--- 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)

                                                 ## CONSUMES ## GUID HOB (The hob holding memory type information)

   gEfiVTUTF8Guid                                ## CONSUMES ## GUID (The type of terminal)

-  gEfiShellFileGuid                             ## CONSUMES ## GUID (Identify the shell file)

   gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootCurrent" (The boot option of current boot)

                                                 ## SOMETIMES_CONSUMES ## Variable:L"BootXX" (Boot option variable)

                                                 ## CONSUMES           ## Variable:L"Timeout" (The time out value in second of showing progress bar)

@@ -110,6 +109,8 @@
   gEfiHiiFontProtocolGuid                       # PROTOCOL CONSUMES

   gEfiSecurityArchProtocolGuid                  # PROTOCOL CONSUMES

 

-[FeaturePcd.common]

+[FeaturePcd]

   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport

 

+[Pcd]

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index a850743643..14a68d8f24 100644
--- 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>

 #include <Guid/GlobalVariable.h>

 #include <Guid/PcAnsi.h>

-#include <Guid/ShellFile.h>

 #include <Guid/Performance.h>

 

 #include <Library/PrintLib.h>