[edk2,4/5] Omap35xxPkg: remove bogus UncachedMemoryAllocationLib dependency

Message ID 20170825121014.15739-5-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • ArmPkg et al: remove UncachedMemoryallocationLib
Related show

Commit Message

Ard Biesheuvel Aug. 25, 2017, 12:10 p.m.
Remove a false dependency on UncachedMemoryAllocationLib, and fix the
broken build while we're at it.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf | 1 +
 Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf                 | 1 -
 Omap35xxPkg/Omap35xxPkg.dsc                                   | 2 --
 3 files changed, 1 insertion(+), 3 deletions(-)

-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf b/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
index 07810d9afd63..5907745b14e2 100644
--- a/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
+++ b/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
@@ -44,3 +44,4 @@  [LibraryClasses]
 [Pcd]
   gOmap35xxTokenSpaceGuid.PcdOmap35xxDebugAgentTimer
   gOmap35xxTokenSpaceGuid.PcdDebugAgentTimerFreqNanoSeconds
+  gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress
diff --git a/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf b/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
index b569cfbdefca..1f6275d7460d 100644
--- a/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
+++ b/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
@@ -33,7 +33,6 @@  [LibraryClasses]
   DebugLib
   UefiBootServicesTableLib
   MemoryAllocationLib
-  UncachedMemoryAllocationLib
   IoLib
   BaseMemoryLib
   ArmLib
diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc
index fc94ca7ed129..941bc97060b9 100644
--- a/Omap35xxPkg/Omap35xxPkg.dsc
+++ b/Omap35xxPkg/Omap35xxPkg.dsc
@@ -72,8 +72,6 @@  [LibraryClasses.common]
 
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
 
-  UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
-
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf