From nobody Sun Feb 8 04:17:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40252+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40252+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376279; cv=none; d=zoho.com; s=zohoarc; b=aNb1C/v46nh5LeEMoS3DM9tAr8aV0J6VbyMFpadNVKuaxbDHPCXMsaC/hJVH5DyEF8IlbFExSGszuucx8UCIoExp8VmkdxNvH25lQXgCTqSKIGSRltOJykya0ck8S2TFPm88CwJ6bPIq6TVPW40T+81d6mvpSb56/0htwgRdBwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=BdA1haW9RdOIetZUsF7DFm/83B20z/s80tiEp5WJAd4=; b=Cl9YX7yzl5NU7ThtoDkPRprUybo/KcLoxTAphkWfI0inQ47E71tlaVmejcN2+Ixi9DpKlGUsW82vbA22UZmWFRvRU+tbSB7AQRUfT9cOvlTfYWdhR3JTLjZKpC4TrE2CHb4p85VWKCjavOh7Z3Rxuw6q1xWcx0UywTKO3of3Ud0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40252+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376279122130.639933190977; Wed, 8 May 2019 21:31:19 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:17 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:16 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 06/16] Vlv2TbltDevicePkg: Find UEFI Shell using gUefiShellFileGuid Date: Wed, 8 May 2019 21:31:01 -0700 Message-Id: <20190509043111.15272-7-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376278; bh=geYAr9lnKhtoYC5UbNVE20bZhS2sKtGOLrkAop0GGGk=; h=Cc:Date:From:Reply-To:Subject:To; b=hVUucoyescC+klEYciYXxu9tGhIRPcWmBpBYKGowHcn2ea4DUppRU+ebMk2TRe6Vzdu +xWbX1mg6K37AeKjpjhJbX/D+hDkODtHdTWwXzVmPr4YpyuVp7jnqGryJrzhSm4AJx9qf 5WTHSYlsb9CFRfGXG/jmnk2/Vpc7MxKP6qY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Remove use of PCD PcdShellFile from the IntelFrameworkModulePkg and instead use gUefiShellFileGuid=20 to find the UEFI Shell in an FV. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- 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/Vlv2T= bltDevicePkg/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 ( =20 Status =3D Fv->ReadFile ( Fv, - PcdGetPtr(PcdShellFile), + &gUefiShellFileGuid, NULL, &Size, &Type, @@ -1528,7 +1528,7 @@ PlatformBdsLibEnumerateAllBootOption ( =20 Status =3D 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.
-# = =20 +# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.
+# + # SPDX-License-Identifier: BSD-2-Clause-Patent =20 -# = =20 +# + # # # @@ -97,6 +99,7 @@ [Guids] gEfiNormalSetupGuid gEfiPartTypeSystemPartGuid gEfiEndOfDxeEventGroupGuid + gUefiShellFileGuid =20 [Pcd] gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKeyFil= eGuid @@ -111,7 +114,6 @@ [Pcd] gPlatformModuleTokenSpaceGuid.PcdFlashFvShellSize gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile gPlatformModuleTokenSpaceGuid.PcdIFWISigBaseAddress gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn diff --git a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/Gen= ericBdsLib/BdsBoot.c b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/L= ibrary/GenericBdsLib/BdsBoot.c index b875041880..3034853695 100644 --- a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBds= Lib/BdsBoot.c +++ b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBds= Lib/BdsBoot.c @@ -1,7 +1,7 @@ /** @file BDS Lib functions which relate with create or process the boot option. =20 -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 =20 **/ @@ -2342,7 +2342,7 @@ BdsLibBootViaBootOption ( // // If the boot option point to Internal FV shell, make sure it is valid // - Status =3D BdsLibUpdateFvFileDevicePath (&DevicePath, PcdGetPtr(PcdShe= llFile)); + Status =3D BdsLibUpdateFvFileDevicePath (&DevicePath, &gUefiShellFileG= uid); if (!EFI_ERROR(Status)) { if (Option->DevicePath !=3D NULL) { FreePool(Option->DevicePath); @@ -3544,7 +3544,7 @@ BdsLibEnumerateAllBootOption ( =20 Status =3D 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); =20 DevicePath =3D AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOC= OL *) &ShellNode); =20 diff --git a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/Gen= ericBdsLib/GenericBdsLib.inf b/Vlv2TbltDevicePkg/Override/IntelFrameworkMod= ulePkg/Library/GenericBdsLib/GenericBdsLib.inf index a978b5cbfa..e3c8a6fa27 100644 --- a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBds= Lib/GenericBdsLib.inf +++ b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBds= Lib/GenericBdsLib.inf @@ -6,7 +6,7 @@ # 2) BDS boot device connect interface; # 3) BDS Misc interfaces for mainting boot variable, ouput string, etc. # =20 -# 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 # =20 ## @@ -43,6 +43,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec + ShellPkg/ShellPkg.dec =20 [LibraryClasses] DevicePathLib @@ -98,6 +99,7 @@ [Guids] ## SOMETIMES_CONSUMES ## Variable:L"LegacyDevOrder" gEfiLegacyDevOrderVariableGuid gEdkiiStatusCodeDataTypeVariableGuid ## SOMETIMES_CONSUMES ## G= UID + gUefiShellFileGuid =20 [Protocols] gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES @@ -131,7 +133,6 @@ [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad ## SOMETIMES= _CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart ## SOMETIMES= _CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## CONSUMES - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed ## C= ONSUMES =20 # --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40252): https://edk2.groups.io/g/devel/message/40252 Mute This Topic: https://groups.io/mt/31551775/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-