[Linaro-uefi,RFC,7/7] Platforms/ARM/Overdrive: move to PrePeiCoreUnicore even on non-PSCI builds

Message ID 1462196143-21998-8-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel May 2, 2016, 1:35 p.m.
Since we are no longer booting the secondaries into SEC and PEI, switch
to the unicore PrePeiCore unconditionally.

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

Patch

diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
index e4ece5e23218..7a88c95bc5d1 100644
--- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
@@ -558,11 +558,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>
diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf
index 263a267fbae7..8d70e9d7c462 100644
--- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf
+++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf
@@ -247,11 +247,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