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

Vlv2TbltDevicePkg: Find UEFI Shell using gUefiShellFileGuid 

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>
This commit is contained in:
Michael D Kinney 2019-05-08 15:07:14 -07:00
parent f4aa56e7cc
commit 927926f454
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
View File

@ -1356,7 +1356,7 @@ PlatformBdsLibEnumerateAllBootOption (
Status = Fv->ReadFile ( Status = Fv->ReadFile (
Fv, Fv,
PcdGetPtr(PcdShellFile), &gUefiShellFileGuid,
NULL, NULL,
&Size, &Size,
&Type, &Type,
@ -1528,7 +1528,7 @@ PlatformBdsLibEnumerateAllBootOption (
Status = Fv->ReadFile ( Status = Fv->ReadFile (
Fv, Fv,
PcdGetPtr(PcdShellFile), &gUefiShellFileGuid,
NULL, NULL,
&Size, &Size,
&Type, &Type,

10
Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
View File

@ -1,11 +1,13 @@
#/** @file #/** @file
# Component name for module PlatformBootManagerLib # Component name for module PlatformBootManagerLib
# #
# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.<BR>
# #
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
# #
# #
# #
@ -97,6 +99,7 @@
gEfiNormalSetupGuid gEfiNormalSetupGuid
gEfiPartTypeSystemPartGuid gEfiPartTypeSystemPartGuid
gEfiEndOfDxeEventGroupGuid gEfiEndOfDxeEventGroupGuid
gUefiShellFileGuid
[Pcd] [Pcd]
gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKeyFileGuid gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKeyFileGuid
@ -111,7 +114,6 @@
gPlatformModuleTokenSpaceGuid.PcdFlashFvShellSize gPlatformModuleTokenSpaceGuid.PcdFlashFvShellSize
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
gPlatformModuleTokenSpaceGuid.PcdIFWISigBaseAddress gPlatformModuleTokenSpaceGuid.PcdIFWISigBaseAddress
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn

8
Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
BDS Lib functions which relate with create or process the boot option. BDS Lib functions which relate with create or process the boot option.
Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@ -2342,7 +2342,7 @@ BdsLibBootViaBootOption (
// //
// If the boot option point to Internal FV shell, make sure it is valid // If the boot option point to Internal FV shell, make sure it is valid
// //
Status = BdsLibUpdateFvFileDevicePath (&DevicePath, PcdGetPtr(PcdShellFile)); Status = BdsLibUpdateFvFileDevicePath (&DevicePath, &gUefiShellFileGuid);
if (!EFI_ERROR(Status)) { if (!EFI_ERROR(Status)) {
if (Option->DevicePath != NULL) { if (Option->DevicePath != NULL) {
FreePool(Option->DevicePath); FreePool(Option->DevicePath);
@ -3544,7 +3544,7 @@ BdsLibEnumerateAllBootOption (
Status = Fv->ReadFile ( Status = Fv->ReadFile (
Fv, Fv,
PcdGetPtr(PcdShellFile), &gUefiShellFileGuid,
NULL, NULL,
&Size, &Size,
&Type, &Type,
@ -3629,7 +3629,7 @@ BdsLibBuildOptionFromShell (
// //
// Build the shell device path // Build the shell device path
// //
EfiInitializeFwVolDevicepathNode (&ShellNode, PcdGetPtr(PcdShellFile)); EfiInitializeFwVolDevicepathNode (&ShellNode, &gUefiShellFileGuid);
DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &ShellNode); DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &ShellNode);

5
Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
View File

@ -6,7 +6,7 @@
# 2) BDS boot device connect interface; # 2) BDS boot device connect interface;
# 3) BDS Misc interfaces for mainting boot variable, ouput string, etc. # 3) BDS Misc interfaces for mainting boot variable, ouput string, etc.
# #
# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
## ##
@ -43,6 +43,7 @@
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
ShellPkg/ShellPkg.dec
[LibraryClasses] [LibraryClasses]
DevicePathLib DevicePathLib
@ -98,6 +99,7 @@
## SOMETIMES_CONSUMES ## Variable:L"LegacyDevOrder" ## SOMETIMES_CONSUMES ## Variable:L"LegacyDevOrder"
gEfiLegacyDevOrderVariableGuid gEfiLegacyDevOrderVariableGuid
gEdkiiStatusCodeDataTypeVariableGuid ## SOMETIMES_CONSUMES ## GUID gEdkiiStatusCodeDataTypeVariableGuid ## SOMETIMES_CONSUMES ## GUID
gUefiShellFileGuid
[Protocols] [Protocols]
gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES
@ -131,7 +133,6 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## CONSUMES
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed ## CONSUMES
# #