From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: lersek@redhat.com) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Fri, 14 Jun 2019 13:33:01 -0700 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2FF393082E63; Fri, 14 Jun 2019 20:32:52 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-141.ams2.redhat.com [10.36.116.141]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03AE619480; Fri, 14 Jun 2019 20:32:48 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH v3 4/4] OvmfPkg: Refer to Shell app via its declared GUID To: devel@edk2.groups.io, hao.a.wu@intel.com Cc: Ray Ni , Jordan Justen , Ard Biesheuvel References: <20190614051854.8856-1-hao.a.wu@intel.com> <20190614051854.8856-5-hao.a.wu@intel.com> From: "Laszlo Ersek" Message-ID: <759cf943-8282-db16-a352-d53cbaf23ce1@redhat.com> Date: Fri, 14 Jun 2019 22:32:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190614051854.8856-5-hao.a.wu@intel.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 14 Jun 2019 20:32:56 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 06/14/19 07:18, Wu, Hao A wrote: > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1843 > > Currently, the file GUID reference of the UEFI Shell app is indirected > via the PCD gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile, > which is set to a fixed value for OvmfPkg. > > So instead, use the symbolic GUID in ShellPkg for this purpose, and drop > the reference to this PCD, and to the IntelFrameworkModulePkg package > entirely. > > Cc: Ray Ni > Cc: Jordan Justen > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Signed-off-by: Hao A Wu > --- > OvmfPkg/OvmfPkgIa32.dsc | 2 -- > OvmfPkg/OvmfPkgIa32X64.dsc | 2 -- > OvmfPkg/OvmfPkgX64.dsc | 2 -- > OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 6 +++--- > OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 4 ++-- > 5 files changed, 5 insertions(+), 11 deletions(-) > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 6830e361bf..473eaba246 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -503,8 +503,6 @@ [PcdsFixedAtBuild] > # > !include NetworkPkg/NetworkPcds.dsc.inc > > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } > - > !if $(SMM_REQUIRE) == TRUE > gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000 > !endif > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 372161365c..73f33b7218 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -509,8 +509,6 @@ [PcdsFixedAtBuild.X64] > # > !include NetworkPkg/NetworkPcds.dsc.inc > > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } > - > !if $(SMM_REQUIRE) == TRUE > gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000 > !endif > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index e0c60bc5dc..39ac791565 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -508,8 +508,6 @@ [PcdsFixedAtBuild] > # > !include NetworkPkg/NetworkPcds.dsc.inc > > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } > - > !if $(SMM_REQUIRE) == TRUE > gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000 > !endif > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > index d25e0a417f..060a3ab4c5 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > +++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > @@ -1,7 +1,7 @@ > ## @file > # Platform BDS customizations library. > # > -# 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 > # > ## > @@ -29,10 +29,10 @@ [Sources] > [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec > SourceLevelDebugPkg/SourceLevelDebugPkg.dec > OvmfPkg/OvmfPkg.dec > SecurityPkg/SecurityPkg.dec > + ShellPkg/ShellPkg.dec > > [LibraryClasses] > BaseLib > @@ -60,7 +60,6 @@ [Pcd] > gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable > gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId > gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile > > [Pcd.IA32, Pcd.X64] > gEfiMdePkgTokenSpaceGuid.PcdFSBClock > @@ -77,3 +76,4 @@ [Guids] > gEfiXenInfoGuid > gEfiEndOfDxeEventGroupGuid > gRootBridgesConnectedEventGroupGuid > + gUefiShellFileGuid > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > index 5b15d3bb12..797731a41c 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > @@ -1,7 +1,7 @@ > /** @file > Platform BDS customizations. > > - 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 > > **/ > @@ -1532,7 +1532,7 @@ PlatformBootManagerAfterConsole ( > // Register UEFI Shell > // > PlatformRegisterFvBootOption ( > - PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE > + &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE > ); > > RemoveStaleFvFileOptions (); > Reviewed-by: Laszlo Ersek Thank you! Laszlo