From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: zailiang.sun@intel.com) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by groups.io with SMTP; Thu, 09 May 2019 00:54:26 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2019 00:54:26 -0700 X-ExtLoop1: 1 Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga004.fm.intel.com with ESMTP; 09 May 2019 00:54:25 -0700 Received: from fmsmsx123.amr.corp.intel.com (10.18.125.38) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 9 May 2019 00:54:25 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx123.amr.corp.intel.com (10.18.125.38) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 9 May 2019 00:54:25 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.33]) by shsmsx102.ccr.corp.intel.com ([169.254.2.249]) with mapi id 14.03.0415.000; Thu, 9 May 2019 15:54:22 +0800 From: "Sun, Zailiang" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: "Qian, Yi" Subject: Re: [Patch 06/16] Vlv2TbltDevicePkg: Find UEFI Shell using gUefiShellFileGuid Thread-Topic: [Patch 06/16] Vlv2TbltDevicePkg: Find UEFI Shell using gUefiShellFileGuid Thread-Index: AQHVBiARYdsLztCH40ushgyopz42CKZibI/w Date: Thu, 9 May 2019 07:54:22 +0000 Message-ID: <7CB7EF03E15B5D48981329A508747A9850C62E0D@SHSMSX104.ccr.corp.intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> <20190509043111.15272-7-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-7-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zailiang.sun@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Zailiang Sun > -----Original Message----- > From: Kinney, Michael D > Sent: Thursday, May 9, 2019 12:31 PM > To: devel@edk2.groups.io > Cc: Sun, Zailiang ; Qian, Yi > Subject: [Patch 06/16] Vlv2TbltDevicePkg: Find UEFI Shell using > gUefiShellFileGuid >=20 > Remove use of PCD PcdShellFile from the IntelFrameworkModulePkg and > instead use gUefiShellFileGuid to find the UEFI Shell in an FV. >=20 > Cc: Zailiang Sun > Cc: Yi Qian > Signed-off-by: Michael D Kinney > --- > 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(-) >=20 > 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 ( >=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] >=20 > gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKey > FileGuid > @@ -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/GenericB > dsLib/BdsBoot.c > b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericB > dsLib/BdsBoot.c > index b875041880..3034853695 100644 > --- > a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericB > dsLib/BdsBoot.c > +++ > b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/Generic > +++ BdsLib/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 va= lid > // > - Status =3D BdsLibUpdateFvFileDevicePath (&DevicePath, > PcdGetPtr(PcdShellFile)); > + Status =3D BdsLibUpdateFvFileDevicePath (&DevicePath, > + &gUefiShellFileGuid); > 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_PROTOCOL *) &ShellNode); >=20 > diff --git > a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericB > dsLib/GenericBdsLib.inf > b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericB > dsLib/GenericBdsLib.inf > index a978b5cbfa..e3c8a6fa27 100644 > --- > a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericB > dsLib/GenericBdsLib.inf > +++ > b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/Generic > +++ BdsLib/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 @@ > [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 > ## GUID > + 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 ## > CONSUMES >=20 > # > -- > 2.21.0.windows.1