From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DA6BE802B4 for ; Wed, 22 Mar 2017 07:39:57 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 444EC80F8E; Wed, 22 Mar 2017 14:39:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 444EC80F8E Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lersek@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 444EC80F8E Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-105.phx2.redhat.com [10.3.116.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A5717E63C; Wed, 22 Mar 2017 14:39:56 +0000 (UTC) To: Ard Biesheuvel , edk2-devel@lists.01.org, leif.lindholm@linaro.org, jaben.carsey@intel.com, ruiyu.ni@intel.com, michael.d.kinney@intel.com, kelly.steele@intel.com References: <1490191448-22398-1-git-send-email-ard.biesheuvel@linaro.org> <1490191448-22398-5-git-send-email-ard.biesheuvel@linaro.org> From: Laszlo Ersek Message-ID: Date: Wed, 22 Mar 2017 15:39:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <1490191448-22398-5-git-send-email-ard.biesheuvel@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 22 Mar 2017 14:39:58 +0000 (UTC) Subject: Re: [PATCH 4/4] ArmVirtPkg/ArmVirtQemu: refer to Shell app via its declared GUID X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 14:39:58 -0000 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit On 03/22/17 15:04, Ard Biesheuvel wrote: > 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 our platforms. > > So instead, use the new symbolic GUID added for this purpose, and drop > the reference to this PCD, and to the IntelFrameworkModulePkg package > entirely. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel > --- > ArmVirtPkg/ArmVirtQemu.dsc | 1 - > ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 - > ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 2 +- > ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 6 +++--- > 4 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index 0bbbe4a7aa4a..4f686faa559c 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -139,7 +139,6 @@ [PcdsFixedAtBuild.common] > > gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } > > # > # The maximum physical I/O addressability of the processor, set with > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc > index 71f16ed192de..6b6555c889a3 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -156,7 +156,6 @@ [PcdsFixedAtBuild.AARCH64] > > gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } > > # > # The maximum physical I/O addressability of the processor, set with > diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c > index 94da51ad49f1..f9591964d577 100644 > --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c > +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c > @@ -691,7 +691,7 @@ PlatformBootManagerAfterConsole ( > // Register UEFI Shell > // > PlatformRegisterFvBootOption ( > - PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE > + &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE > ); > > RemoveStaleFvFileOptions (); > diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > index 1f162c663fc1..bac6c781b3c8 100644 > --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > @@ -35,11 +35,11 @@ [Sources] > QemuKernel.c > > [Packages] > - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec > + ArmVirtPkg/ArmVirtPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > OvmfPkg/OvmfPkg.dec > - ArmVirtPkg/ArmVirtPkg.dec > + ShellPkg/ShellPkg.dec > > [LibraryClasses] > BaseLib > @@ -58,7 +58,6 @@ [LibraryClasses] > UefiRuntimeServicesTableLib > > [FixedPcd] > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity > @@ -74,6 +73,7 @@ [Guids] > gEfiFileSystemVolumeLabelInfoIdGuid > gEfiEndOfDxeEventGroupGuid > gRootBridgesConnectedEventGroupGuid > + gUefiShellFileGuid > > [Protocols] > gEfiDevicePathProtocolGuid > Works for me if the shellpkg maintainers are OK with the centralization of the GUID. Reviewed-by: Laszlo Ersek