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

ArmPkg/PlatformBootManagerLib: refer to Shell FILE_GUID directly 

Instead of indirecting the reference to the Shell binary via a PCD
that is defined in IntelFrameworkModulePkg, and which invariably
gets set to the same value by all users of this library, refer to
the UEFI Shell application by its declared symbolic GUID.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
This commit is contained in:
Ard Biesheuvel 2017-03-18 21:18:42 +00:00
parent 2edc20c468
commit 07548e17c5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
View File

@ -33,7 +33,6 @@
#define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) } #define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) }
#pragma pack (1) #pragma pack (1)
typedef struct { typedef struct {
VENDOR_DEVICE_PATH SerialDxe; VENDOR_DEVICE_PATH SerialDxe;
@ -327,7 +326,7 @@ AddOutput (
STATIC STATIC
VOID VOID
PlatformRegisterFvBootOption ( PlatformRegisterFvBootOption (
EFI_GUID *FileGuid, CONST EFI_GUID *FileGuid,
CHAR16 *Description, CHAR16 *Description,
UINT32 Attributes UINT32 Attributes
) )
@ -535,7 +534,7 @@ PlatformBootManagerAfterConsole (
// Register UEFI Shell // Register UEFI Shell
// //
PlatformRegisterFvBootOption ( PlatformRegisterFvBootOption (
PcdGetPtr (PcdShellFile), L"UEFI Shell", LOAD_OPTION_ACTIVE &gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE
); );
} }

3
ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
View File

@ -39,6 +39,7 @@
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
ShellPkg/ShellPkg.dec
[LibraryClasses] [LibraryClasses]
BaseLib BaseLib
@ -59,7 +60,6 @@
[FixedPcd] [FixedPcd]
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity
@ -75,6 +75,7 @@
gEfiFileSystemVolumeLabelInfoIdGuid gEfiFileSystemVolumeLabelInfoIdGuid
gEfiEndOfDxeEventGroupGuid gEfiEndOfDxeEventGroupGuid
gEfiTtyTermGuid gEfiTtyTermGuid
gUefiShellFileGuid
[Protocols] [Protocols]
gEfiDevicePathProtocolGuid gEfiDevicePathProtocolGuid