[Linaro-uefi,7/8] Platforms/AMD: switch Overdrive 1000 to DtPlatformDxe

Message ID 20170406102941.14802-8-ard.biesheuvel@linaro.org
State Accepted
Commit 5df98e8fa05b5072dde7e2f145dc60950726f661
Headers show
Series
  • Platforms/AMD/Overdrive: switch to DtPlatformDxe
Related show

Commit Message

Ard Biesheuvel April 6, 2017, 10:29 a.m.
Replace FdtDxe with the generic DtPlatformDxe, which forces mutual
exclusion between DT and ACPI, and does not depend on the deprecated
ARM BdsLib.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc | 10 ++++++----
 Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

Patch

diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc
index f723452ad2f2..b1a7cfd4c4a8 100644
--- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc
@@ -563,11 +563,10 @@  DEFINE DO_KCS       = 1
   #
   # FDT support
   #
-  OpenPlatformPkg/Platforms/AMD/Styx/Drivers/FdtDxe/FdtDxe.inf {
+  EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf {
     <LibraryClasses>
-      # deprecated BdsLib from the ARM BDS
-      BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
       FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
+      DtPlatformDtbLoaderLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf
   }
 
   #
@@ -637,7 +636,10 @@  DEFINE DO_KCS       = 1
   #
   # ACPI Support
   #
-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
+  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf {
+    <LibraryClasses>
+      NULL|EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
+  }
   OpenPlatformPkg/Platforms/AMD/Styx/AcpiTables/AcpiAml.inf
   OpenPlatformPkg/Platforms/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
 
diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf
index 170d80be84fa..c7f98b087fa9 100644
--- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf
+++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf
@@ -141,9 +141,9 @@  READ_LOCK_STATUS   = TRUE
   #
   # FDT support
   #
-  INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/FdtDxe/FdtDxe.inf
+  INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
 
-  FILE FREEFORM = PCD(gAmdStyxTokenSpaceGuid.PcdStyxFdt) {
+  FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
     SECTION RAW = OpenPlatformPkg/Platforms/AMD/Styx/Overdrive1000Board/FdtBlob/styx-overdrive1000.dtb
   }