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

diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeim.c b/ArmPlatformPkg/PlatformPei/PlatformPeim.c
index 58ecb31ec2fc2bba8093c3a7200f16f537a8e77b..e4535250c245a70fe2b070d0db0002e555c7b9a8 100755 (executable)
--- a/ArmPlatformPkg/PlatformPei/PlatformPeim.c
+++ b/ArmPlatformPkg/PlatformPei/PlatformPeim.c
@@ -17,7 +17,6 @@
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r
-#include <Ppi/ArmGlobalVariable.h>\r
 #include <Ppi/MasterBootMode.h>\r
 #include <Ppi/BootInRecoveryMode.h>\r
 #include <Ppi/GuidedSectionExtraction.h>\r
@@ -32,8 +31,6 @@
 #include <Library/PeiServicesLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
-#include <Guid/ArmGlobalVariableHob.h>\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 InitializePlatformPeim (\r
@@ -62,24 +59,6 @@ CONST EFI_PEI_PPI_DESCRIPTOR  mPpiListRecoveryBootMode = {
   NULL\r
 };\r
 \r
-VOID\r
-EFIAPI\r
-BuildGlobalVariableHob (\r
-  IN EFI_PHYSICAL_ADDRESS         GlobalVariableBase,\r
-  IN UINT32                       GlobalVariableSize\r
-  )\r
-{\r
-  EFI_STATUS                Status;\r
-  ARM_HOB_GLOBAL_VARIABLE   *Hob;\r
-\r
-  Status = PeiServicesCreateHob (EFI_HOB_TYPE_GUID_EXTENSION, sizeof (ARM_HOB_GLOBAL_VARIABLE), (VOID**)&Hob);\r
-  if (!EFI_ERROR(Status)) {\r
-    CopyGuid (&(Hob->Header.Name), &gArmGlobalVariableGuid);\r
-    Hob->GlobalVariableBase = GlobalVariableBase;\r
-    Hob->GlobalVariableSize = GlobalVariableSize;\r
-  }\r
-}\r
-\r
 /*++\r
 \r
 Routine Description:\r
@@ -105,23 +84,11 @@ InitializePlatformPeim (
 {\r
   EFI_STATUS                    Status;\r
   UINTN                         BootMode;\r
-  ARM_GLOBAL_VARIABLE_PPI       *ArmGlobalVariablePpi;\r
-  EFI_PHYSICAL_ADDRESS          GlobalVariableBase;\r
 \r
   DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Platform PEIM Loaded\n"));\r
 \r
   PlatformPeim ();\r
 \r
-  Status = PeiServicesLocatePpi (&gArmGlobalVariablePpiGuid, 0, NULL, (VOID**)&ArmGlobalVariablePpi);\r
-  if (!EFI_ERROR(Status)) {\r
-    Status = ArmGlobalVariablePpi->GetGlobalVariableMemory (&GlobalVariableBase);\r
-\r
-    if (!EFI_ERROR(Status)) {\r
-      // Declare the Global Variable HOB\r
-      BuildGlobalVariableHob (GlobalVariableBase, FixedPcdGet32 (PcdPeiGlobalVariableSize));\r
-    }\r
-  }\r
-\r
   BootMode  = ArmPlatformGetBootMode ();\r
   Status    = (**PeiServices).SetBootMode (PeiServices, (UINT8) BootMode);\r
   ASSERT_EFI_ERROR (Status);\r

diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeim.inf b/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
index 3822b093503b459bb1069586b0dbb50f8222273e..f466c1412ad318a6fb8c96144e6a7f2963214899 100755 (executable)
--- a/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
+++ b/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
@@ -47,10 +47,6 @@
 [Ppis]\r
   gEfiPeiMasterBootModePpiGuid                  # PPI ALWAYS_PRODUCED\r
   gEfiPeiBootInRecoveryModePpiGuid              # PPI SOMETIMES_PRODUCED\r
-  gArmGlobalVariablePpiGuid\r
-\r
-[Guids]\r
-  gArmGlobalVariableGuid\r
 \r
 [FixedPcd]\r
   gArmTokenSpaceGuid.PcdFdBaseAddress\r
@@ -62,8 +58,6 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize\r
 \r
-  gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize\r
-\r
 [Depex]\r
   TRUE\r
 \r