[Linaro-uefi,06/11] Platforms/AMD/Styx/OverdriveBoard: make BdsLib reference local to FdtDxe

Message ID 1462982452-1316-7-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel May 11, 2016, 4 p.m.
The ARM BDS is long gone, but its utility library BdsLib is still used
in some places, like FdtDxe. So make the BdsLib local to the FdtDxe.inf
reference in the Overdrive .DSC to prevent new references from other
modules creeping in.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Patch

diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
index aa64be59a204..6eac8e4d64d5 100644
--- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
@@ -152,9 +152,9 @@  DEFINE TRANS_CODE = $(EL3_TO_EL2)
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
   DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf
 
-  # BDS Libraries
-  BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
-  FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
+  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
+  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
 
 [LibraryClasses.common.SEC]
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
@@ -640,7 +640,12 @@  DEFINE TRANS_CODE = $(EL3_TO_EL2)
   #
   # FDT support
   #
-  OpenPlatformPkg/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf
+  OpenPlatformPkg/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf {
+    <LibraryClasses>
+      # deprecated BdsLib from the ARM BDS
+      BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
+      FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
+  }
 
   #
   # PCI support