tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
lgao4 2009-07-09 05:48:35 +00:00
parent c437405563
commit d46f36324f
23 changed files with 38 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DuetPkg/DuetPkg.fdf
View File

@ -117,7 +117,7 @@ INF DuetPkg/BiosVideoThunkDxe/BiosVideo.inf
# Binary INF file to support toggle among different CPU architectures.
INF FatBinPkg/EnhancedFatDxe/Fat.inf
FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
SECTION RAW = MdeModulePkg/Logo/Logo.bmp
}

2
DuetPkg/Library/DuetBdsLib/BdsPlatform.c
View File

@ -1139,7 +1139,7 @@ Returns:
// from the graphic lib
//
if (QuietBoot) {
Status = EnableQuietBoot (&gEfiDefaultBmpLogoGuid);
Status = EnableQuietBoot (PcdGetPtr(PcdLogoFile));
if (EFI_ERROR (Status)) {
DisableQuietBoot ();
return;

1
DuetPkg/Library/DuetBdsLib/BdsPlatform.h
View File

@ -45,7 +45,6 @@ Abstract:
#include <Protocol/PciIo.h>
#include <Guid/Logo.h>
#include <Guid/Acpi.h>
#include <Guid/SmBios.h>
#include <Guid/Mps.h>

4
DuetPkg/Library/DuetBdsLib/PlatformBds.inf
View File

@ -63,4 +63,6 @@
gEfiAcpiTableGuid
[Pcd]
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile

23
IntelFrameworkModulePkg/Include/Guid/Logo.h
View File

@ -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

24
IntelFrameworkModulePkg/Include/Guid/ShellFile.h
View File

@ -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

15
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
View File

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

8
IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
View File

@ -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 {

5
IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
View File

@ -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

1
IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
View File

@ -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>

2
Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c
View File

@ -282,7 +282,7 @@ Returns:
// from the graphic lib
//
if (QuietBoot) {
EnableQuietBoot (&gEfiDefaultBmpLogoGuid);
EnableQuietBoot (PcdGetPtr(PcdLogoFile));
//
// Perform system diagnostic
//

1
Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h
View File

@ -37,7 +37,6 @@ Abstract:
#include <Protocol/WinNtThunk.h>
#include <Protocol/WinNtIo.h>
#include <Guid/Logo.h>
#include <Guid/WinNtSystemConfig.h>
extern BDS_CONSOLE_CONNECT_ENTRY gPlatformConsole[];

4
Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf
View File

@ -54,13 +54,13 @@
GenericBdsLib
[Guids]
gEfiDefaultBmpLogoGuid
gEfiWinNtSystemConfigGuid
[Pcd.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
[Depex]
gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid

14
Nt32Pkg/Nt32Pkg.fdf
View File

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

2
OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
View File

@ -770,7 +770,7 @@ Returns:
// from the graphic lib
//
if (QuietBoot) {
EnableQuietBoot (&gEfiDefaultBmpLogoGuid);
EnableQuietBoot (PcdGetPtr(PcdLogoFile));
//
// Perform system diagnostic
//

3
OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
View File

@ -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[];

4
OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
View File

@ -48,11 +48,9 @@
GenericBdsLib
PciLib
[Guids]
gEfiDefaultBmpLogoGuid
[Pcd.common]
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
[Pcd.IA32, Pcd.X64]
gEfiMdePkgTokenSpaceGuid.PcdFSBClock

2
OvmfPkg/OvmfPkg.fdf
View File

@ -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
}

4
OvmfPkg/OvmfPkgIa32X64.fdf
View File

@ -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
}

2
UnixPkg/Library/UnixBdsLib/BdsPlatform.c
View File

@ -281,7 +281,7 @@ Returns:
// from the graphic lib
//
if (QuietBoot) {
EnableQuietBoot (&gEfiDefaultBmpLogoGuid);
EnableQuietBoot (PcdGetPtr(PcdLogoFile));
//
// Perform system diagnostic
//

1
UnixPkg/Library/UnixBdsLib/BdsPlatform.h
View File

@ -37,7 +37,6 @@ Abstract:
#include <Protocol/UnixThunk.h>
#include <Protocol/UnixIo.h>
#include <Guid/Logo.h>
#include <Guid/UnixSystemConfig.h>
extern BDS_CONSOLE_CONNECT_ENTRY gPlatformConsole[];

2
UnixPkg/Library/UnixBdsLib/PlatformBds.inf
View File

@ -55,13 +55,13 @@
[Guids]
gEfiDefaultBmpLogoGuid # ALWAYS_CONSUMED
gEfiUnixSystemConfigGuid
[Pcd.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
[Depex]
gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid

6
UnixPkg/UnixPkg.fdf
View File

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