[Linaro-uefi,RFC,2/7] Platforms/AMD/Styx/Library/AmdStyxLib: use [Ppis] section as intended

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

Commit Message

Ard Biesheuvel May 2, 2016, 1:35 p.m.
Declare the used PPI in the [Ppis] .inf section so that we don't have
to define it explicitly in the code.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf    | 3 +++
 Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf | 3 +++
 Platforms/AMD/Styx/Library/AmdStyxLib/Styx.c            | 6 +-----
 3 files changed, 7 insertions(+), 5 deletions(-)

Patch

diff --git a/Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf b/Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
index 13a58310145b..94ab49047d1e 100644
--- a/Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
+++ b/Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
@@ -56,6 +56,9 @@ 
 [Guids]
   gAmdStyxMpCoreInfoGuid               ## CONSUMER
 
+[Ppis]
+  gArmMpCoreInfoPpiGuid
+
 [FeaturePcd]
   gEmbeddedTokenSpaceGuid.PcdCacheEnable
   gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping
diff --git a/Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf b/Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
index bcdb103d1e09..3375d79f294c 100644
--- a/Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
+++ b/Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
@@ -56,6 +56,9 @@ 
   gEmbeddedTokenSpaceGuid.PcdCacheEnable
   gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping
 
+[Ppis]
+  gArmMpCoreInfoPpiGuid
+
 [Pcd]
   gArmTokenSpaceGuid.PcdSystemMemoryBase
   gArmTokenSpaceGuid.PcdSystemMemorySize
diff --git a/Platforms/AMD/Styx/Library/AmdStyxLib/Styx.c b/Platforms/AMD/Styx/Library/AmdStyxLib/Styx.c
index 8534af0347d6..79131d965e7f 100644
--- a/Platforms/AMD/Styx/Library/AmdStyxLib/Styx.c
+++ b/Platforms/AMD/Styx/Library/AmdStyxLib/Styx.c
@@ -142,16 +142,12 @@  PrePeiCoreGetMpCoreInfo (
 }
 
 
-//
-// Needs to be declared in the file. Otherwise gArmMpCoreInfoPpiGuid is undefined in the contect of PrePeiCore
-//
-EFI_GUID mArmMpCoreInfoPpiGuid = ARM_MP_CORE_INFO_PPI_GUID;
 ARM_MP_CORE_INFO_PPI mMpCoreInfoPpi = { PrePeiCoreGetMpCoreInfo };
 
 EFI_PEI_PPI_DESCRIPTOR      gPlatformPpiTable[] = {
   {
     EFI_PEI_PPI_DESCRIPTOR_PPI,
-    &mArmMpCoreInfoPpiGuid,
+    &gArmMpCoreInfoPpiGuid,
     &mMpCoreInfoPpi
   }
 };