Omap35xxPkg: remove bogus UncachedMemoryAllocationLib dependency

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>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf b/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
index 07810d9afd63da7ece220f8745445d2fe4bd061d..5907745b14e2123145774ba1ee313c146a10c143 100644 (file)
--- a/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
+++ b/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
@@ -44,3 +44,4 @@
 [Pcd]\r
   gOmap35xxTokenSpaceGuid.PcdOmap35xxDebugAgentTimer\r
   gOmap35xxTokenSpaceGuid.PcdDebugAgentTimerFreqNanoSeconds\r
 [Pcd]\r
   gOmap35xxTokenSpaceGuid.PcdOmap35xxDebugAgentTimer\r
   gOmap35xxTokenSpaceGuid.PcdDebugAgentTimerFreqNanoSeconds\r

+  gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress\r

diff --git a/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf b/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
index b569cfbdefca9eb19daf8609fdd298b96abfecdd..1f6275d7460da0b3af0a0ccae83037f5b3bd1026 100644 (file)
--- a/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
+++ b/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
@@ -33,7 +33,6 @@
   DebugLib\r
   UefiBootServicesTableLib\r
   MemoryAllocationLib\r
   DebugLib\r
   UefiBootServicesTableLib\r
   MemoryAllocationLib\r

-  UncachedMemoryAllocationLib\r

   IoLib\r
   BaseMemoryLib\r
   ArmLib\r
   IoLib\r
   BaseMemoryLib\r
   ArmLib\r

diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc
index fc94ca7ed1291d859405b92a83930cb6600d9bb8..941bc97060b9ad4e6b6ae2407113cd8cac07611b 100644 (file)
--- a/Omap35xxPkg/Omap35xxPkg.dsc
+++ b/Omap35xxPkg/Omap35xxPkg.dsc
@@ -72,8 +72,6 @@
 \r
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
 \r
 \r
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
 \r

-  UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf\r
-\r

   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf\r
 \r
 \r
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf\r
 \r
 \r