diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-03-22 13:49:24 +0000 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-03-22 15:34:59 +0000 |
| commit | c81c2c0fc453328525050f31c31e7614166a6b20 (patch) | |
| tree | 63b4dadade04372a7942f1c13f45d4870829d004 /ArmVirtPkg/Library | |
| parent | 07548e17c5ffb5ade0608ab8802b4024c4781e43 (diff) | |
| download | edk2-c81c2c0fc453328525050f31c31e7614166a6b20.tar.gz edk2-c81c2c0fc453328525050f31c31e7614166a6b20.tar.bz2 edk2-c81c2c0fc453328525050f31c31e7614166a6b20.zip | |
ArmVirtPkg/ArmVirtQemu: refer to Shell app via its declared GUID
Currently, the file GUID reference of the UEFI Shell app is indirected
via the PCD gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile,
which is set to a fixed value for our platforms.
So instead, use the new symbolic GUID added for this purpose, and drop
the reference to this PCD, and to the IntelFrameworkModulePkg package
entirely.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'ArmVirtPkg/Library')
| -rw-r--r-- | ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 2 | ||||
| -rw-r--r-- | ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c index 94da51ad49..f9591964d5 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -691,7 +691,7 @@ PlatformBootManagerAfterConsole ( // Register UEFI Shell
//
PlatformRegisterFvBootOption (
- PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE
+ &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
);
RemoveStaleFvFileOptions ();
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 1f162c663f..bac6c781b3 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -35,11 +35,11 @@ QemuKernel.c
[Packages]
- IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+ ArmVirtPkg/ArmVirtPkg.dec
MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec
OvmfPkg/OvmfPkg.dec
- ArmVirtPkg/ArmVirtPkg.dec
+ ShellPkg/ShellPkg.dec
[LibraryClasses]
BaseLib
@@ -58,7 +58,6 @@ UefiRuntimeServicesTableLib
[FixedPcd]
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity
@@ -74,6 +73,7 @@ gEfiFileSystemVolumeLabelInfoIdGuid
gEfiEndOfDxeEventGroupGuid
gRootBridgesConnectedEventGroupGuid
+ gUefiShellFileGuid
[Protocols]
gEfiDevicePathProtocolGuid
|