Latest upstream edk2 SHA: b30abe7df464d91b84a42763e61bb3c85bfd80c9 (code base date: 14 Sept 2017) does not contain "UncachedMemoryAllocationLib" and "DmaLib" in ArmPkg. Hence remove all references to make it compile.
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Supreeth Venkatesh supreeth.venkatesh@arm.com ---
Maintainer Notes: * Please commit this to AArch64StandaloneMm Branch only. * Migration of MM to edk2-platforms wont happen until next month. So this is just a stop gap measure. --- Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 3 --- 1 file changed, 3 deletions(-)
diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc index 0bad7c9..ca0846f 100644 --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc @@ -24,10 +24,8 @@ [LibraryClasses.common] !if $(TARGET) == RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf !else DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf - UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf !endif DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
@@ -72,7 +70,6 @@ DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf - DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf ArmGicArchLib|ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
On Fri, Sep 15, 2017 at 04:58:32PM +0100, Supreeth Venkatesh wrote:
Latest upstream edk2 SHA: b30abe7df464d91b84a42763e61bb3c85bfd80c9 (code base date: 14 Sept 2017) does not contain "UncachedMemoryAllocationLib" and "DmaLib" in ArmPkg. Hence remove all references to make it compile.
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Supreeth Venkatesh supreeth.venkatesh@arm.com
Reviewed-by: Leif Lindholm leif.lindholm@linaro.org Pushed as 620a1f4925
Maintainer Notes:
- Please commit this to AArch64StandaloneMm Branch only.
- Migration of MM to edk2-platforms wont happen until next
month. So this is just a stop gap measure.
Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 3 --- 1 file changed, 3 deletions(-)
diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc index 0bad7c9..ca0846f 100644 --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc @@ -24,10 +24,8 @@ [LibraryClasses.common] !if $(TARGET) == RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
- UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
!else DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
- UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
!endif DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf @@ -72,7 +70,6 @@ DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
- DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf ArmGicArchLib|ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
-- 2.14.1
-
Leif Lindholm -
Supreeth Venkatesh