[Linaro-uefi,02/14] Platforms/AMD/Styx/CelloBoard.dsc: remove bogus 'if $(DO_PSCI)'

Message ID 1462882313-7637-3-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel May 10, 2016, 12:11 p.m.
The patch that conditionally switches to the unicore PrePeiCore
tests a define that does not exist on Cello. So remove it, and
always use the unicore version (like we now do on Overdrive as well)

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

Patch

diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc
index b36eeb838c77..fcdffbd278b5 100644
--- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc
+++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc
@@ -546,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>
diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf
index 3fc128e14c4d..3af47ef4c5b6 100644
--- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf
+++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf
@@ -239,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