From 927926f454859e44d8830eb4db559433fc05e08d Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Wed, 8 May 2019 15:07:14 -0700 Subject: [PATCH] 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 Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun Reviewed-by: Yi Qian --- Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c | 4 ++-- .../Library/PlatformBdsLib/PlatformBdsLib.inf | 10 ++++++---- .../Library/GenericBdsLib/BdsBoot.c | 8 ++++---- .../Library/GenericBdsLib/GenericBdsLib.inf | 5 +++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c index 0f0e15c64a..e86c6b3e2e 100644 --- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c +++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c @@ -1356,7 +1356,7 @@ PlatformBdsLibEnumerateAllBootOption ( Status = Fv->ReadFile ( Fv, - PcdGetPtr(PcdShellFile), + &gUefiShellFileGuid, NULL, &Size, &Type, @@ -1528,7 +1528,7 @@ PlatformBdsLibEnumerateAllBootOption ( Status = Fv->ReadFile ( Fv, - PcdGetPtr(PcdShellFile), + &gUefiShellFileGuid, NULL, &Size, &Type, diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf index 5831569fae..d3bef0fa39 100644 --- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf +++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf @@ -1,11 +1,13 @@ #/** @file # Component name for module PlatformBootManagerLib # -# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.
-# +# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.
+# + # SPDX-License-Identifier: BSD-2-Clause-Patent -# +# + # # # @@ -97,6 +99,7 @@ gEfiNormalSetupGuid gEfiPartTypeSystemPartGuid gEfiEndOfDxeEventGroupGuid + gUefiShellFileGuid [Pcd] gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKeyFileGuid @@ -111,7 +114,6 @@ gPlatformModuleTokenSpaceGuid.PcdFlashFvShellSize gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile gPlatformModuleTokenSpaceGuid.PcdIFWISigBaseAddress gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn diff --git a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c index b875041880..3034853695 100644 --- a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c +++ b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c @@ -1,7 +1,7 @@ /** @file BDS Lib functions which relate with create or process the boot option. -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
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 // - Status = BdsLibUpdateFvFileDevicePath (&DevicePath, PcdGetPtr(PcdShellFile)); + Status = BdsLibUpdateFvFileDevicePath (&DevicePath, &gUefiShellFileGuid); if (!EFI_ERROR(Status)) { if (Option->DevicePath != NULL) { FreePool(Option->DevicePath); @@ -3544,7 +3544,7 @@ BdsLibEnumerateAllBootOption ( Status = Fv->ReadFile ( Fv, - PcdGetPtr(PcdShellFile), + &gUefiShellFileGuid, NULL, &Size, &Type, @@ -3629,7 +3629,7 @@ BdsLibBuildOptionFromShell ( // // Build the shell device path // - EfiInitializeFwVolDevicepathNode (&ShellNode, PcdGetPtr(PcdShellFile)); + EfiInitializeFwVolDevicepathNode (&ShellNode, &gUefiShellFileGuid); DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &ShellNode); diff --git a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf index a978b5cbfa..e3c8a6fa27 100644 --- a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf +++ b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf @@ -6,7 +6,7 @@ # 2) BDS boot device connect interface; # 3) BDS Misc interfaces for mainting boot variable, ouput string, etc. # -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -43,6 +43,7 @@ MdeModulePkg/MdeModulePkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec + ShellPkg/ShellPkg.dec [LibraryClasses] DevicePathLib @@ -98,6 +99,7 @@ ## SOMETIMES_CONSUMES ## Variable:L"LegacyDevOrder" gEfiLegacyDevOrderVariableGuid gEdkiiStatusCodeDataTypeVariableGuid ## SOMETIMES_CONSUMES ## GUID + gUefiShellFileGuid [Protocols] gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES @@ -131,7 +133,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## CONSUMES - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed ## CONSUMES #