ArmPlatformPkg/PlatformPeim: remove ArmGlobalVariable lowlevel init

Now that we dropped all ArmPlatformGlobalVariableLib dependencies,
there is no longer a need to query the ArmGlobalVariable PPI and install
the ArmGlobalVariable HOB. So remove it.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18993 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 0 insertions, 39 deletions

diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeim.c b/ArmPlatformPkg/PlatformPei/PlatformPeim.c
index 58ecb31ec2..e4535250c2 100755
--- a/ArmPlatformPkg/PlatformPei/PlatformPeim.c
+++ b/ArmPlatformPkg/PlatformPei/PlatformPeim.c
@@ -17,7 +17,6 @@
 //

 // The protocols, PPI and GUID defintions for this module

 //

-#include <Ppi/ArmGlobalVariable.h>

 #include <Ppi/MasterBootMode.h>

 #include <Ppi/BootInRecoveryMode.h>

 #include <Ppi/GuidedSectionExtraction.h>

@@ -32,8 +31,6 @@
 #include <Library/PeiServicesLib.h>

 #include <Library/PcdLib.h>

 

-#include <Guid/ArmGlobalVariableHob.h>

-

 EFI_STATUS

 EFIAPI

 InitializePlatformPeim (

@@ -62,24 +59,6 @@ CONST EFI_PEI_PPI_DESCRIPTOR  mPpiListRecoveryBootMode = {
   NULL

 };

 

-VOID

-EFIAPI

-BuildGlobalVariableHob (

-  IN EFI_PHYSICAL_ADDRESS         GlobalVariableBase,

-  IN UINT32                       GlobalVariableSize

-  )

-{

-  EFI_STATUS                Status;

-  ARM_HOB_GLOBAL_VARIABLE   *Hob;

-

-  Status = PeiServicesCreateHob (EFI_HOB_TYPE_GUID_EXTENSION, sizeof (ARM_HOB_GLOBAL_VARIABLE), (VOID**)&Hob);

-  if (!EFI_ERROR(Status)) {

-    CopyGuid (&(Hob->Header.Name), &gArmGlobalVariableGuid);

-    Hob->GlobalVariableBase = GlobalVariableBase;

-    Hob->GlobalVariableSize = GlobalVariableSize;

-  }

-}

-

 /*++

 

 Routine Description:

@@ -105,23 +84,11 @@ InitializePlatformPeim (
 {

   EFI_STATUS                    Status;

   UINTN                         BootMode;

-  ARM_GLOBAL_VARIABLE_PPI       *ArmGlobalVariablePpi;

-  EFI_PHYSICAL_ADDRESS          GlobalVariableBase;

 

   DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Platform PEIM Loaded\n"));

 

   PlatformPeim ();

 

-  Status = PeiServicesLocatePpi (&gArmGlobalVariablePpiGuid, 0, NULL, (VOID**)&ArmGlobalVariablePpi);

-  if (!EFI_ERROR(Status)) {

-    Status = ArmGlobalVariablePpi->GetGlobalVariableMemory (&GlobalVariableBase);

-

-    if (!EFI_ERROR(Status)) {

-      // Declare the Global Variable HOB

-      BuildGlobalVariableHob (GlobalVariableBase, FixedPcdGet32 (PcdPeiGlobalVariableSize));

-    }

-  }

-

   BootMode  = ArmPlatformGetBootMode ();

   Status    = (**PeiServices).SetBootMode (PeiServices, (UINT8) BootMode);

   ASSERT_EFI_ERROR (Status);

diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeim.inf b/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
index 3822b09350..f466c1412a 100755
--- a/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
+++ b/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
@@ -47,10 +47,6 @@
 [Ppis]

   gEfiPeiMasterBootModePpiGuid                  # PPI ALWAYS_PRODUCED

   gEfiPeiBootInRecoveryModePpiGuid              # PPI SOMETIMES_PRODUCED

-  gArmGlobalVariablePpiGuid

-

-[Guids]

-  gArmGlobalVariableGuid

 

 [FixedPcd]

   gArmTokenSpaceGuid.PcdFdBaseAddress

@@ -62,8 +58,6 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize

 

-  gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize

-

 [Depex]

   TRUE