On 8 September 2016 at 09:49, Laszlo Ersek <[email protected]> wrote: > On 09/08/16 10:19, Ard Biesheuvel wrote: >> On 5 September 2016 at 12:06, Ard Biesheuvel <[email protected]> >> 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 <[email protected]> >>> --- >>> 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 <[email protected]> >
Thanks > Sorry about missing this. > No worries! _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
