X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ArmPlatformPkg%2FPlatformPei%2FPlatformPeim.c;h=14f301e947a8ef69e059d92751bb2c07b594933f;hp=58ecb31ec2fc2bba8093c3a7200f16f537a8e77b;hb=f33d5d68abc02727dc828c1079e72ab65e1d63af;hpb=64748d26a684a7b86b4d979d2de4fbe0557192a2

diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeim.c b/ArmPlatformPkg/PlatformPei/PlatformPeim.c
old mode 100755
new mode 100644
index 58ecb31ec2..14f301e947
--- 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:
@@ -104,33 +83,23 @@ InitializePlatformPeim (
   )
 {
   EFI_STATUS                    Status;
-  UINTN                         BootMode;
-  ARM_GLOBAL_VARIABLE_PPI       *ArmGlobalVariablePpi;
-  EFI_PHYSICAL_ADDRESS          GlobalVariableBase;
+  EFI_BOOT_MODE                 BootMode;
 
   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);
+  Status = PeiServicesSetBootMode (ArmPlatformGetBootMode ());
+  ASSERT_EFI_ERROR (Status);
 
-    if (!EFI_ERROR(Status)) {
-      // Declare the Global Variable HOB
-      BuildGlobalVariableHob (GlobalVariableBase, FixedPcdGet32 (PcdPeiGlobalVariableSize));
-    }
-  }
+  PlatformPeim ();
 
-  BootMode  = ArmPlatformGetBootMode ();
-  Status    = (**PeiServices).SetBootMode (PeiServices, (UINT8) BootMode);
+  Status = PeiServicesGetBootMode (&BootMode);
   ASSERT_EFI_ERROR (Status);
 
-  Status = (**PeiServices).InstallPpi (PeiServices, &mPpiListBootMode);
+  Status = PeiServicesInstallPpi (&mPpiListBootMode);
   ASSERT_EFI_ERROR (Status);
 
   if (BootMode == BOOT_IN_RECOVERY_MODE) {
-    Status = (**PeiServices).InstallPpi (PeiServices, &mPpiListRecoveryBootMode);
+    Status = PeiServicesInstallPpi (&mPpiListRecoveryBootMode);
     ASSERT_EFI_ERROR (Status);
   }