Remove use of PCD PcdShellFile from the IntelFrameworkModulePkg
and instead use gUefiShellFileGuid to find the UEFI Shell in
an FV.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>
Reviewed-by: Yi Qian <yi.qian@intel.com>
\r
Status = Fv->ReadFile (\r
Fv,\r
\r
Status = Fv->ReadFile (\r
Fv,\r
- PcdGetPtr(PcdShellFile),\r
NULL,\r
&Size,\r
&Type,\r
NULL,\r
&Size,\r
&Type,\r
\r
Status = Fv->ReadFile (\r
Fv,\r
\r
Status = Fv->ReadFile (\r
Fv,\r
- PcdGetPtr(PcdShellFile),\r
NULL,\r
&Size,\r
&Type,\r
NULL,\r
&Size,\r
&Type,\r
#/** @file\r
# Component name for module PlatformBootManagerLib\r
#\r
#/** @file\r
# Component name for module PlatformBootManagerLib\r
#\r
-# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.<BR>\r
-# \r\r
+# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.<BR>\r
+#\r
+\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
gEfiNormalSetupGuid\r
gEfiPartTypeSystemPartGuid\r
gEfiEndOfDxeEventGroupGuid\r
gEfiNormalSetupGuid\r
gEfiPartTypeSystemPartGuid\r
gEfiEndOfDxeEventGroupGuid\r
\r
[Pcd]\r
gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKeyFileGuid\r
\r
[Pcd]\r
gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKeyFileGuid\r
gPlatformModuleTokenSpaceGuid.PcdFlashFvShellSize\r
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile\r
gPlatformModuleTokenSpaceGuid.PcdFlashFvShellSize\r
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile\r
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile\r
gPlatformModuleTokenSpaceGuid.PcdIFWISigBaseAddress\r
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
gPlatformModuleTokenSpaceGuid.PcdIFWISigBaseAddress\r
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
/** @file\r
BDS Lib functions which relate with create or process the boot option.\r
\r
/** @file\r
BDS Lib functions which relate with create or process the boot option.\r
\r
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>\r
SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
//\r
// If the boot option point to Internal FV shell, make sure it is valid\r
//\r
//\r
// If the boot option point to Internal FV shell, make sure it is valid\r
//\r
- Status = BdsLibUpdateFvFileDevicePath (&DevicePath, PcdGetPtr(PcdShellFile));\r
+ Status = BdsLibUpdateFvFileDevicePath (&DevicePath, &gUefiShellFileGuid);\r
if (!EFI_ERROR(Status)) {\r
if (Option->DevicePath != NULL) {\r
FreePool(Option->DevicePath);\r
if (!EFI_ERROR(Status)) {\r
if (Option->DevicePath != NULL) {\r
FreePool(Option->DevicePath);\r
\r
Status = Fv->ReadFile (\r
Fv,\r
\r
Status = Fv->ReadFile (\r
Fv,\r
- PcdGetPtr(PcdShellFile),\r
NULL,\r
&Size,\r
&Type,\r
NULL,\r
&Size,\r
&Type,\r
//\r
// Build the shell device path\r
//\r
//\r
// Build the shell device path\r
//\r
- EfiInitializeFwVolDevicepathNode (&ShellNode, PcdGetPtr(PcdShellFile));\r
+ EfiInitializeFwVolDevicepathNode (&ShellNode, &gUefiShellFileGuid);\r
\r
DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &ShellNode);\r
\r
\r
DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &ShellNode);\r
\r
# 2) BDS boot device connect interface;\r
# 3) BDS Misc interfaces for mainting boot variable, ouput string, etc.\r
# \r
# 2) BDS boot device connect interface;\r
# 3) BDS Misc interfaces for mainting boot variable, ouput string, etc.\r
# \r
-# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
# \r
##\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
# \r
##\r
MdeModulePkg/MdeModulePkg.dec\r
IntelFrameworkPkg/IntelFrameworkPkg.dec\r
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
MdeModulePkg/MdeModulePkg.dec\r
IntelFrameworkPkg/IntelFrameworkPkg.dec\r
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
+ ShellPkg/ShellPkg.dec\r
\r
[LibraryClasses]\r
DevicePathLib\r
\r
[LibraryClasses]\r
DevicePathLib\r
## SOMETIMES_CONSUMES ## Variable:L"LegacyDevOrder"\r
gEfiLegacyDevOrderVariableGuid\r
gEdkiiStatusCodeDataTypeVariableGuid ## SOMETIMES_CONSUMES ## GUID\r
## SOMETIMES_CONSUMES ## Variable:L"LegacyDevOrder"\r
gEfiLegacyDevOrderVariableGuid\r
gEdkiiStatusCodeDataTypeVariableGuid ## SOMETIMES_CONSUMES ## GUID\r
\r
[Protocols]\r
gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES\r
\r
[Protocols]\r
gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES\r
gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad ## SOMETIMES_CONSUMES\r
gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart ## SOMETIMES_CONSUMES\r
gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## CONSUMES\r
gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad ## SOMETIMES_CONSUMES\r
gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart ## SOMETIMES_CONSUMES\r
gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## CONSUMES\r
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile ## CONSUMES\r
gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed ## CONSUMES\r
\r
#\r
gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed ## CONSUMES\r
\r
#\r