diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-03-18 21:18:42 +0000 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-03-22 15:33:42 +0000 |
| commit | 07548e17c5ffb5ade0608ab8802b4024c4781e43 (patch) | |
| tree | 825d394d6255a4d2a97042109945849153dffb69 /ArmPkg/Library | |
| parent | 2edc20c468634b0264cbc4da42be2b70b31a8031 (diff) | |
| download | edk2-platforms-07548e17c5ffb5ade0608ab8802b4024c4781e43.tar.xz | |
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>
Diffstat (limited to 'ArmPkg/Library')
| -rw-r--r-- | ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 5 | ||||
| -rw-r--r-- | ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c index 67e87c1c26..bb21bb65d5 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -33,7 +33,6 @@ #define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) }
-
#pragma pack (1)
typedef struct {
VENDOR_DEVICE_PATH SerialDxe;
@@ -327,7 +326,7 @@ AddOutput ( STATIC
VOID
PlatformRegisterFvBootOption (
- EFI_GUID *FileGuid,
+ CONST EFI_GUID *FileGuid,
CHAR16 *Description,
UINT32 Attributes
)
@@ -535,7 +534,7 @@ PlatformBootManagerAfterConsole ( // Register UEFI Shell
//
PlatformRegisterFvBootOption (
- PcdGetPtr (PcdShellFile), L"UEFI Shell", LOAD_OPTION_ACTIVE
+ &gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE
);
}
diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 8ec4f1dea6..beca5800d6 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -39,6 +39,7 @@ IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec
+ ShellPkg/ShellPkg.dec
[LibraryClasses]
BaseLib
@@ -59,7 +60,6 @@ [FixedPcd]
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity
@@ -75,6 +75,7 @@ gEfiFileSystemVolumeLabelInfoIdGuid
gEfiEndOfDxeEventGroupGuid
gEfiTtyTermGuid
+ gUefiShellFileGuid
[Protocols]
gEfiDevicePathProtocolGuid
|