[Linaro-uefi,1/4] Support only ACPI+PSCI on HuskyBoard

Message ID 1461965918-28324-2-git-send-email-leo.duran@amd.com
State New
Headers show

Commit Message

Duran, Leo April 29, 2016, 9:38 p.m.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leo Duran <leo.duran@amd.com>
---
 Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc | 10 ----------
 Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf | 13 -------------
 2 files changed, 23 deletions(-)

Patch

diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc
index 251c3a7..6a20166 100644
--- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc
+++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc
@@ -152,7 +152,6 @@  DEFINE TRANS_CODE = $(EL3_TO_EL2)
 
   # BDS Libraries
   BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
-  FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
 
 [LibraryClasses.common.SEC]
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
@@ -547,11 +546,7 @@  DEFINE TRANS_CODE = $(EL3_TO_EL2)
   #
   # PEI Phase modules
   #
-!if $(DO_PSCI)
   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
-!else
-  ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
-!endif
   MdeModulePkg/Core/Pei/PeiMain.inf
   MdeModulePkg/Universal/PCD/Pei/Pcd.inf {
     <LibraryClasses>
@@ -618,11 +613,6 @@  DEFINE TRANS_CODE = $(EL3_TO_EL2)
   AmdModulePkg/Iscp/IscpDxe.inf
 
   #
-  # FDT support
-  #
-  OpenPlatformPkg/Platforms/AMD/Styx/Drivers/FdtDxe/FdtDxe.inf
-
-  #
   # PCI support
   #
   AmdModulePkg/Gionb/Gionb.inf
diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf
index c5a9065..262d313 100644
--- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf
+++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf
@@ -132,15 +132,6 @@  READ_LOCK_STATUS   = TRUE
   INF AmdModulePkg/Iscp/IscpDxe.inf
 
   #
-  # FDT support
-  #
-  INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/FdtDxe/FdtDxe.inf
-
-  FILE FREEFORM = PCD(gAmdStyxTokenSpaceGuid.PcdStyxFdt) {
-    SECTION RAW = OpenPlatformPkg/Platforms/AMD/Styx/FdtBlob/styx-husky.dtb
-  }
-
-  #
   # PCI support
   #
   INF AmdModulePkg/Gionb/Gionb.inf
@@ -248,11 +239,7 @@  READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 
-!if $(DO_PSCI)
   INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
-!else
-  INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
-!endif
   INF MdeModulePkg/Core/Pei/PeiMain.inf
   INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf
   INF AmdModulePkg/Iscp/IscpPei.inf