tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-24 22:24:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

ArmPlatformPkg/PlatformPeim: remove ArmGlobalVariable lowlevel init

Browse Source 
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
This commit is contained in:
Ard Biesheuvel 2015-11-27 17:07:17 +00:00 committed by abiesheuvel
parent f2e17a0731
commit 6ef6afac50
2 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ArmPlatformPkg/PlatformPei/PlatformPeim.c
View File

@ -17,7 +17,6 @@
// //
// The protocols, PPI and GUID defintions for this module // The protocols, PPI and GUID defintions for this module
// //
#include <Ppi/ArmGlobalVariable.h>
#include <Ppi/MasterBootMode.h> #include <Ppi/MasterBootMode.h>
#include <Ppi/BootInRecoveryMode.h> #include <Ppi/BootInRecoveryMode.h>
#include <Ppi/GuidedSectionExtraction.h> #include <Ppi/GuidedSectionExtraction.h>
@ -32,8 +31,6 @@
#include <Library/PeiServicesLib.h> #include <Library/PeiServicesLib.h>
#include <Library/PcdLib.h> #include <Library/PcdLib.h>
#include <Guid/ArmGlobalVariableHob.h>
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
InitializePlatformPeim ( InitializePlatformPeim (
@ -62,24 +59,6 @@ CONST EFI_PEI_PPI_DESCRIPTOR mPpiListRecoveryBootMode = {
NULL 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: Routine Description:
@ -105,23 +84,11 @@ InitializePlatformPeim (
{ {
EFI_STATUS Status; EFI_STATUS Status;
UINTN BootMode; UINTN BootMode;
ARM_GLOBAL_VARIABLE_PPI *ArmGlobalVariablePpi;
EFI_PHYSICAL_ADDRESS GlobalVariableBase;
DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Platform PEIM Loaded\n")); DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Platform PEIM Loaded\n"));
PlatformPeim (); 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 (); BootMode = ArmPlatformGetBootMode ();
Status = (**PeiServices).SetBootMode (PeiServices, (UINT8) BootMode); Status = (**PeiServices).SetBootMode (PeiServices, (UINT8) BootMode);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);

6
ArmPlatformPkg/PlatformPei/PlatformPeim.inf
View File

@ -47,10 +47,6 @@
[Ppis] [Ppis]
gEfiPeiMasterBootModePpiGuid # PPI ALWAYS_PRODUCED gEfiPeiMasterBootModePpiGuid # PPI ALWAYS_PRODUCED
gEfiPeiBootInRecoveryModePpiGuid # PPI SOMETIMES_PRODUCED gEfiPeiBootInRecoveryModePpiGuid # PPI SOMETIMES_PRODUCED
gArmGlobalVariablePpiGuid
[Guids]
gArmGlobalVariableGuid
[FixedPcd] [FixedPcd]
gArmTokenSpaceGuid.PcdFdBaseAddress gArmTokenSpaceGuid.PcdFdBaseAddress
@ -62,8 +58,6 @@
gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize
gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize
gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize
[Depex] [Depex]
TRUE TRUE