ArmPlatformPkg: remove ArmGlobalVariable PCD, GUID and PPI definitions

Now that we removed all references to the ArmGlobalVariable definitions
in the various lowlevel PrePi and PrePeiCore init routines, and removed
the PPI and HOB references from PlatformPeim, it is time to say goodbye
to ArmGlobalVariable. So remove the includes and the .DEC declarations.

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@19003 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
index 8147db982727bd70e463e3a842d3593e0249d1f3..e881c13439e4066fe3e69ddfddedc93fe4a0bf1c 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
@@ -38,15 +38,8 @@
   #\r
   gVariableRuntimeDxeFileGuid = { 0xcbd2e4d5, 0x7068, 0x4ff5, { 0xb4, 0x62, 0x98, 0x22, 0xb4, 0xad, 0x8d, 0x60 } }\r
 \r
-  ## Include/Guid/ArmGlobalVariableHob.h\r
-  gArmGlobalVariableGuid      = { 0xc3253c90, 0xa24f, 0x4599, { 0xa6, 0x64, 0x1f, 0x88, 0x13, 0x77, 0x8f, 0xc9} }\r
-\r
   gArmBootMonFsFileInfoGuid   = { 0x41e26b9c, 0xada6, 0x45b3, { 0x80, 0x8e, 0x23, 0x57, 0xa3, 0x5b, 0x60, 0xd6 } }\r
 \r
-[Ppis]\r
-  ## Include/Ppi/ArmGlobalVariable.h\r
-  gArmGlobalVariablePpiGuid = { 0xab1c1816, 0xd542, 0x4e6f, {0x9b, 0x1e, 0x8e, 0xcd, 0x92, 0x53, 0xe2, 0xe7} }\r
-\r
 [PcdsFeatureFlag.common]\r
   # Set this PCD to TRUE to map NORFlash at 0x0. FALSE means the DRAM is mapped at 0x0.\r
   gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping|FALSE|BOOLEAN|0x00000012\r
@@ -81,19 +74,6 @@
   # Size of the region used by UEFI in permanent memory (Reserved 128MB by default)\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x08000000|UINT32|0x00000015\r
 \r
-  # Size to reserve in the primary core stack for PEI Global Variables\r
-  #  = sizeof(UINTN) /* PcdPeiServicePtr or HobListPtr */\r
-  gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize|0x4|UINT32|0x00000016\r
-  # PeiServicePtr and HobListPtr shares the same location in the PEI Global Variable list\r
-  # PeiServicePtr is only valid with PEI Core and HobListPtr only when the PEI Core is skipped.\r
-  ## TO BE REMOVED\r
-  ## ArmPlatformTokenSpaceGuid.PcdPeiServicePtrGlobalOffset|0x0|UINT32|0x00000017\r
-  ## TO BE REMOVED\r
-  ## gArmPlatformTokenSpaceGuid.PcdHobListPtrGlobalOffset|0x0|UINT32|0x00000018\r
-\r
-  # Size to reserve in the primary core stack for SEC Global Variables\r
-  gArmPlatformTokenSpaceGuid.PcdSecGlobalVariableSize|0x0|UINT32|0x00000031\r
-\r
   # Boot Monitor FileSystem\r
   gArmPlatformTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L""|VOID*|0x0000003A\r
 \r

diff --git a/ArmPlatformPkg/Include/Guid/ArmGlobalVariableHob.h b/ArmPlatformPkg/Include/Guid/ArmGlobalVariableHob.h
deleted file mode 100644 (file)
index 844090b..0000000
--- a/ArmPlatformPkg/Include/Guid/ArmGlobalVariableHob.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/** @file\r
-*\r
-*  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
-*\r
-*  This program and the accompanying materials\r
-*  are licensed and made available under the terms and conditions of the BSD License\r
-*  which accompanies this distribution.  The full text of the license may be found at\r
-*  http://opensource.org/licenses/bsd-license.php\r
-*\r
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-*\r
-**/\r
-\r
-#ifndef __ARM_GLOBAL_VARIABLE_GUID_H__\r
-#define __ARM_GLOBAL_VARIABLE_GUID_H__\r
-\r
-#include <Pi/PiBootMode.h>\r
-#include <Pi/PiHob.h>\r
-\r
-#define ARM_HOB_GLOBAL_VARIABLE_GUID  \\r
-  { 0xc3253c90, 0xa24f, 0x4599, { 0xa6, 0x64, 0x1f, 0x88, 0x13, 0x77, 0x8f, 0xc9} };\r
-\r
-extern EFI_GUID gArmGlobalVariableGuid;\r
-\r
-///\r
-/// Describes all memory ranges used during the HOB producer\r
-/// phase that exist outside the HOB list. This HOB type\r
-/// describes how memory is used, not the physical attributes of memory.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The Guid HOB header. Header.HobType = EFI_HOB_TYPE_GUID_EXTENSION\r
-  ///                 and  Header.Name    = gArmGlobalVariableGuid\r
-  ///\r
-  EFI_HOB_GUID_TYPE            Header;\r
-\r
-  ///\r
-  /// The base address of memory allocated by this HOB. Type\r
-  /// EFI_PHYSICAL_ADDRESS is defined in AllocatePages() in the UEFI 2.0\r
-  /// specification.\r
-  ///\r
-  EFI_PHYSICAL_ADDRESS        GlobalVariableBase;\r
-\r
-  ///\r
-  /// The length in bytes of memory allocated by this HOB.\r
-  ///\r
-  UINT32                      GlobalVariableSize;\r
-} ARM_HOB_GLOBAL_VARIABLE;\r
-\r
-#endif\r

diff --git a/ArmPlatformPkg/Include/Ppi/ArmGlobalVariable.h b/ArmPlatformPkg/Include/Ppi/ArmGlobalVariable.h
deleted file mode 100644 (file)
index 8a29b83..0000000
--- a/ArmPlatformPkg/Include/Ppi/ArmGlobalVariable.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/** @file\r
-*\r
-*  Copyright (c) 2011, ARM Limited. All rights reserved.\r
-*\r
-*  This program and the accompanying materials\r
-*  are licensed and made available under the terms and conditions of the BSD License\r
-*  which accompanies this distribution.  The full text of the license may be found at\r
-*  http://opensource.org/licenses/bsd-license.php\r
-*\r
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-*\r
-**/\r
-\r
-#ifndef __ARM_GLOBAL_VARIABLE_H__\r
-#define __ARM_GLOBAL_VARIABLE_H__\r
-\r
-#define ARM_GLOBAL_VARIABLE_PPI_GUID  \\r
-  { 0xab1c1816, 0xd542, 0x4e6f, {0x9b, 0x1e, 0x8e, 0xcd, 0x92, 0x53, 0xe2, 0xe7} }\r
-\r
-\r
-/**\r
-  This service of the EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI that migrates temporary RAM into\r
-  permanent memory.\r
-\r
-  @param PeiServices            Pointer to the PEI Services Table.\r
-  @param TemporaryMemoryBase    Source Address in temporary memory from which the SEC or PEIM will copy the\r
-                                Temporary RAM contents.\r
-  @param PermanentMemoryBase    Destination Address in permanent memory into which the SEC or PEIM will copy the\r
-                                Temporary RAM contents.\r
-  @param CopySize               Amount of memory to migrate from temporary to permanent memory.\r
-\r
-  @retval EFI_SUCCESS           The data was successfully returned.\r
-  @retval EFI_INVALID_PARAMETER PermanentMemoryBase + CopySize > TemporaryMemoryBase when\r
-                                TemporaryMemoryBase > PermanentMemoryBase.\r
-\r
-**/\r
-typedef\r
-EFI_STATUS\r
-(EFIAPI * ARM_GLOBAL_VARIABLE_GET_MEMORY) (\r
-  OUT EFI_PHYSICAL_ADDRESS    *GlobalVariableBase\r
-);\r
-\r
-///\r
-/// This service abstracts the ability to migrate contents of the platform early memory store.\r
-/// Note: The name EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI is different from the current PI 1.2 spec.\r
-///       This PPI was optional.\r
-///\r
-typedef struct {\r
-  ARM_GLOBAL_VARIABLE_GET_MEMORY   GetGlobalVariableMemory;\r
-} ARM_GLOBAL_VARIABLE_PPI;\r
-\r
-extern EFI_GUID gArmGlobalVariablePpiGuid;\r
-\r
-#endif\r