Revision: 18993
http://sourceforge.net/p/edk2/code/18993
Author: abiesheuvel
Date: 2015-11-27 17:07:17 +0000 (Fri, 27 Nov 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Leif Lindholm <[email protected]>
Modified Paths:
--------------
trunk/edk2/ArmPlatformPkg/PlatformPei/PlatformPeim.c
trunk/edk2/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
Modified: trunk/edk2/ArmPlatformPkg/PlatformPei/PlatformPeim.c
===================================================================
--- trunk/edk2/ArmPlatformPkg/PlatformPei/PlatformPeim.c 2015-11-27
17:07:06 UTC (rev 18992)
+++ trunk/edk2/ArmPlatformPkg/PlatformPei/PlatformPeim.c 2015-11-27
17:07:17 UTC (rev 18993)
@@ -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 @@
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 @@
{
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);
Modified: trunk/edk2/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
===================================================================
--- trunk/edk2/ArmPlatformPkg/PlatformPei/PlatformPeim.inf 2015-11-27
17:07:06 UTC (rev 18992)
+++ trunk/edk2/ArmPlatformPkg/PlatformPei/PlatformPeim.inf 2015-11-27
17:07:17 UTC (rev 18993)
@@ -47,11 +47,7 @@
[Ppis]
gEfiPeiMasterBootModePpiGuid # PPI ALWAYS_PRODUCED
gEfiPeiBootInRecoveryModePpiGuid # PPI SOMETIMES_PRODUCED
- gArmGlobalVariablePpiGuid
-[Guids]
- gArmGlobalVariableGuid
-
[FixedPcd]
gArmTokenSpaceGuid.PcdFdBaseAddress
gArmTokenSpaceGuid.PcdFdSize
@@ -62,8 +58,6 @@
gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize
gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize
- gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize
-
[Depex]
TRUE
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
