diff options
Diffstat (limited to 'IntelFrameworkModulePkg/Library')
3 files changed, 7 insertions, 7 deletions
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>
|