On 17 June 2016 at 18:30, Laszlo Ersek <[email protected]> wrote: > On 06/16/16 12:29, Ard Biesheuvel wrote: >> Switch all users of ArmLib that depend on the MMU routines to the new, >> separate ArmMmuLib. This needs to occur in one go, since the MMU >> routines are removed from ArmLib build at the same time, to prevent >> conflicting symbols. >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Ard Biesheuvel <[email protected]> >> --- >> ArmPkg/Drivers/CpuDxe/CpuDxe.inf | >> 1 + >> ArmPkg/Include/Library/ArmLib.h | >> 38 - >> ArmPkg/Library/ArmLib/AArch64/AArch64BaseLibConstructor.c | >> 36 - >> ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf | >> 3 - >> ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf | >> 1 - >> ArmPkg/Library/ArmLib/AArch64/AArch64Mmu.c | >> 751 -------------------- >> ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.S | >> 6 - >> ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm | >> 6 - >> ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h | >> 12 - >> ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf | >> 1 - >> ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf | >> 1 - >> ArmPkg/Library/ArmLib/ArmV7/ArmV7Mmu.c | >> 418 ----------- >> ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S | >> 5 - >> ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm | >> 4 - >> ArmVirtPkg/ArmVirtQemu.dsc | >> 2 + >> ArmVirtPkg/ArmVirtXen.dsc | >> 2 + >> ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c | >> 1 + >> ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf | >> 1 + >> MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c | >> 1 + >> MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | >> 1 + >> 20 files changed, 9 insertions(+), 1282 deletions(-) > > [snip] > >> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc >> index 32a5aa977401..3decb11712ff 100644 >> --- a/ArmVirtPkg/ArmVirtQemu.dsc >> +++ b/ArmVirtPkg/ArmVirtQemu.dsc >> @@ -47,6 +47,8 @@ [LibraryClasses.ARM] >> ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf >> >> [LibraryClasses.common] >> + ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf >> + >> # Virtio Support >> VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf >> >> VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf >> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc >> index 594ca6491b7a..ba7ec10db224 100644 >> --- a/ArmVirtPkg/ArmVirtXen.dsc >> +++ b/ArmVirtPkg/ArmVirtXen.dsc >> @@ -45,6 +45,8 @@ [LibraryClasses.ARM] >> ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf >> >> [LibraryClasses.common] >> + ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf >> + >> # Virtio Support >> VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf >> >> VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf >> diff --git >> a/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c >> b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c >> index f6c69152848e..251e5314e61d 100644 >> --- a/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c >> +++ b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c >> @@ -15,6 +15,7 @@ >> >> #include <PiPei.h> >> >> +#include <Library/ArmMmuLib.h> >> #include <Library/ArmPlatformLib.h> >> #include <Library/DebugLib.h> >> #include <Library/HobLib.h> >> diff --git >> a/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf >> b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf >> index 9fba16f90f1f..028d6fb5ac28 100644 >> --- a/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf >> +++ b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf >> @@ -34,6 +34,7 @@ [LibraryClasses] >> DebugLib >> HobLib >> ArmLib >> + ArmMmuLib >> ArmPlatformLib >> CacheMaintenanceLib >> > > Shouldn't you add the library resolution to "ArmVirtQemuKernel.dsc" too? > That DSC too resolves ArmLib. >
You're quite right. Thanks for spotting that. I will add it before committing > Acked-by: Laszlo Ersek <[email protected]> > Thanks! _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
