From: "Sun, Zailiang" <zailiang.sun@intel.com>
To: "Kinney, Michael D" <michael.d.kinney@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Qian, Yi" <yi.qian@intel.com>
Subject: Re: [Patch 06/16] Vlv2TbltDevicePkg: Find UEFI Shell using gUefiShellFileGuid
Date: Thu, 9 May 2019 07:54:22 +0000 [thread overview]
Message-ID: <7CB7EF03E15B5D48981329A508747A9850C62E0D@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <20190509043111.15272-7-michael.d.kinney@intel.com>
Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, May 9, 2019 12:31 PM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
> Subject: [Patch 06/16] 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>
> ---
> 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.<BR>
> -#
>
> +# Copyright (c) 2008 - 2019, Intel Corporation. All rights
> +reserved.<BR> #
> +
> # SPDX-License-Identifier: BSD-2-Clause-Patent
>
> -#
>
> +#
> +
> #
> #
> #
> @@ -97,6 +99,7 @@ [Guids]
> gEfiNormalSetupGuid
> gEfiPartTypeSystemPartGuid
> gEfiEndOfDxeEventGroupGuid
> + gUefiShellFileGuid
>
> [Pcd]
>
> 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.
>
> -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
>
> **/
> @@ -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/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.<BR>
> +# Copyright (c) 2007 - 2019, Intel Corporation. All rights
> +reserved.<BR>
> # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -43,6 +43,7 @@
> [Packages]
> MdeModulePkg/MdeModulePkg.dec
> IntelFrameworkPkg/IntelFrameworkPkg.dec
> IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> + ShellPkg/ShellPkg.dec
>
> [LibraryClasses]
> DevicePathLib
> @@ -98,6 +99,7 @@ [Guids]
> ## SOMETIMES_CONSUMES ## Variable:L"LegacyDevOrder"
> gEfiLegacyDevOrderVariableGuid
> gEdkiiStatusCodeDataTypeVariableGuid ## SOMETIMES_CONSUMES
> ## GUID
> + gUefiShellFileGuid
>
> [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
>
> #
> --
> 2.21.0.windows.1
next prev parent reply other threads:[~2019-05-09 7:54 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-09 4:30 [Patch 00/16] Vlv2TbltDevicePkg: Sync with edk2/master Michael D Kinney
2019-05-09 4:30 ` [Patch 01/16] Vlv2TbltDevicePkg/PlatformFlashAccessLib: Add error return Michael D Kinney
2019-05-09 7:53 ` Sun, Zailiang
2019-05-09 7:53 ` Sun, Zailiang
2019-05-09 13:18 ` Qian, Yi
2019-05-09 4:30 ` [Patch 02/16] Vlv2TbltDevicePkg/AcpiPlatform: Change Size type to UINTN Michael D Kinney
2019-05-09 8:15 ` Sun, Zailiang
2019-05-09 13:19 ` Qian, Yi
2019-05-09 4:30 ` [Patch 03/16] Vlv2TbltDevicePkg/AcpiPlatform: Add variable protocols to depex Michael D Kinney
2019-05-09 7:53 ` Sun, Zailiang
2019-05-09 13:18 ` Qian, Yi
2019-05-09 4:30 ` [Patch 04/16] Vlv2TbltDevicePkg/PpmPolicy: Fix call to MP Services Protocol Michael D Kinney
2019-05-09 7:54 ` Sun, Zailiang
2019-05-09 13:19 ` Qian, Yi
2019-05-09 4:31 ` [Patch 05/16] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix GCC build issue Michael D Kinney
2019-05-09 7:54 ` Sun, Zailiang
2019-05-09 13:19 ` Qian, Yi
2019-05-09 4:31 ` [Patch 06/16] Vlv2TbltDevicePkg: Find UEFI Shell using gUefiShellFileGuid Michael D Kinney
2019-05-09 7:54 ` Sun, Zailiang [this message]
2019-05-09 13:19 ` Qian, Yi
2019-05-09 4:31 ` [Patch 07/16] Vlv2TbltDevicePkg: Build full UEFI Shell from sources Michael D Kinney
2019-05-09 7:54 ` Sun, Zailiang
2019-05-09 13:19 ` Qian, Yi
2019-05-09 4:31 ` [Patch 08/16] Vlv2TbltDevicePkg: Use CpuDxe from UefiCpuPkg Michael D Kinney
2019-05-09 7:54 ` Sun, Zailiang
2019-05-09 13:18 ` Qian, Yi
2019-05-09 4:31 ` [Patch 09/16] Vlv2TbltDevicePkg: Add PchInitSmm module Michael D Kinney
2019-05-09 7:54 ` Sun, Zailiang
2019-05-09 13:20 ` Qian, Yi
2019-05-09 4:31 ` [Patch 10/16] Vlv2TbltDevicePkg: Always enable QuietBoot to produce BGRT Michael D Kinney
2019-05-09 7:54 ` Sun, Zailiang
2019-05-09 13:20 ` Qian, Yi
2019-05-09 4:31 ` [Patch 11/16] Vlv2TbltDevicePkg/Stitch/Gcc: Update default setting binary Michael D Kinney
2019-05-09 7:54 ` Sun, Zailiang
2019-05-09 13:20 ` Qian, Yi
2019-05-09 4:31 ` [Patch 12/16] Vlv2TbltDevicePkg: Remove directory assumptions from build scripts Michael D Kinney
2019-05-09 7:55 ` Sun, Zailiang
2019-05-09 13:21 ` Qian, Yi
2019-05-09 4:31 ` [Patch 13/16] Vlv2TbltDevicePkg/Capsule: Do not clear UEFI varstore Michael D Kinney
2019-05-09 7:55 ` Sun, Zailiang
2019-05-09 13:20 ` Qian, Yi
2019-05-09 4:31 ` [Patch 14/16] Vlv2TbltDevicePkg/Capsule: Remove path to openssl tools Michael D Kinney
2019-05-09 7:55 ` Sun, Zailiang
2019-05-09 13:20 ` Qian, Yi
2019-05-09 4:31 ` [Patch 15/16] Vlv2TbltDevicePkg/Capsule: Add Linux/LVFS generation scripts Michael D Kinney
2019-05-09 7:55 ` Sun, Zailiang
2019-05-09 13:21 ` Qian, Yi
2019-05-09 4:31 ` [Patch 16/16] Vlv2TbltDevicePkg: Update Readme.md Michael D Kinney
2019-05-09 7:58 ` Sun, Zailiang
2019-05-09 13:21 ` Qian, Yi
2019-05-09 13:18 ` [Patch 00/16] Vlv2TbltDevicePkg: Sync with edk2/master Qian, Yi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7CB7EF03E15B5D48981329A508747A9850C62E0D@SHSMSX104.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox