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 8E55D1A1F52 for ; Thu, 8 Sep 2016 01:49:14 -0700 (PDT) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 025ED81127; Thu, 8 Sep 2016 08:49:14 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-57.phx2.redhat.com [10.3.116.57]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u888nCU2009425; Thu, 8 Sep 2016 04:49:12 -0400 To: Ard Biesheuvel , edk2-devel-01 , Leif Lindholm References: <1473073566-1504-1-git-send-email-ard.biesheuvel@linaro.org> <1473073566-1504-4-git-send-email-ard.biesheuvel@linaro.org> From: Laszlo Ersek Message-ID: <053b4acc-1e03-1239-7cad-3b2db8d3d3d7@redhat.com> Date: Thu, 8 Sep 2016 10:49:11 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 08 Sep 2016 08:49:14 +0000 (UTC) Subject: Re: [PATCH 3/5] ArmVirtPkg: remove all ArmLib resolutions with ArmBaseLib X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Sep 2016 08:49:14 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 09/08/16 10:19, Ard Biesheuvel wrote: > On 5 September 2016 at 12:06, Ard Biesheuvel wrote: >> The various ArmLib flavors are identical in practice, and a new >> ArmBaseLib has been introduced that can replace all of them. So replace >> all occurrences with ArmBaseLib. >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Ard Biesheuvel >> --- >> ArmVirtPkg/ArmVirtQemu.dsc | 9 +-------- >> ArmVirtPkg/ArmVirtQemuKernel.dsc | 6 +----- >> ArmVirtPkg/ArmVirtXen.dsc | 12 +----------- >> 3 files changed, 3 insertions(+), 24 deletions(-) >> >> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc >> index c503ef243f9a..a3beb4654072 100644 >> --- a/ArmVirtPkg/ArmVirtQemu.dsc >> +++ b/ArmVirtPkg/ArmVirtQemu.dsc >> @@ -39,14 +39,13 @@ [Defines] >> !include ArmVirtPkg/ArmVirt.dsc.inc >> >> [LibraryClasses.AARCH64] >> - ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf >> ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf >> >> [LibraryClasses.ARM] >> - ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf >> ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf >> >> [LibraryClasses.common] >> + ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf >> ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf >> >> # Virtio Support >> @@ -75,12 +74,6 @@ [LibraryClasses.common] >> [LibraryClasses.common.UEFI_DRIVER] >> UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf >> >> -[LibraryClasses.AARCH64.SEC] >> - ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf >> - >> -[LibraryClasses.ARM.SEC] >> - ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf >> - >> [BuildOptions] >> RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmVirtPkg/Include >> GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmVirtPkg/Include >> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc >> index 383d9b7d2c0b..e0dcf4300338 100644 >> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc >> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc >> @@ -38,17 +38,13 @@ [Defines] >> !include ArmVirtPkg/ArmVirt.dsc.inc >> >> [LibraryClasses.AARCH64] >> - ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf >> ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf >> >> [LibraryClasses.ARM] >> - ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf >> ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf >> >> -[LibraryClasses.ARM.SEC] >> - ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf >> - >> [LibraryClasses.common] >> + ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf >> ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf >> >> # Virtio Support >> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc >> index 191b615785d3..3422d1e5d996 100644 >> --- a/ArmVirtPkg/ArmVirtXen.dsc >> +++ b/ArmVirtPkg/ArmVirtXen.dsc >> @@ -37,17 +37,13 @@ [LibraryClasses] >> XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf >> >> [LibraryClasses.AARCH64] >> - ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf >> ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf >> >> [LibraryClasses.ARM] >> - ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf >> ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf >> >> -[LibraryClasses.ARM.SEC] >> - ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf >> - >> [LibraryClasses.common] >> + ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf >> ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf >> >> # Virtio Support >> @@ -69,12 +65,6 @@ [LibraryClasses.common] >> [LibraryClasses.common.UEFI_DRIVER] >> UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf >> >> -[LibraryClasses.AARCH64.SEC] >> - ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf >> - >> -[LibraryClasses.ARM.SEC] >> - ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf >> - >> [BuildOptions] >> RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmVirtPkg/Include >> GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmVirtPkg/Include >> -- >> 2.7.4 >> > > Laszlo, > > Any objections? > > Thanks, > Ard. > I guess I could verify the coverage with a "git grep", but I'm pretty sure that's what you used anyway, for locating what needed to be replaced. What I see in the patch looks good. So, Reviewed-by: Laszlo Ersek Sorry about missing this. Laszlo