ArmPlatformPkg: remove PeiServicesTablePointerLib implementation

This removes the PeiServicesTablePointerLib implementation under
ArmPlatformPkg that violates the PI spec, and hence should not be
used. Instead, the implementation that resides under ArmPkg should
be used.

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

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
index cb95516881c75a52924499527cfa9c14cc8151f8..8147db982727bd70e463e3a842d3593e0249d1f3 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
@@ -86,7 +86,8 @@
   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
-  gArmPlatformTokenSpaceGuid.PcdPeiServicePtrGlobalOffset|0x0|UINT32|0x00000017\r
+  ## TO BE REMOVED\r
+  ## ArmPlatformTokenSpaceGuid.PcdPeiServicePtrGlobalOffset|0x0|UINT32|0x00000017\r
   ## TO BE REMOVED\r
   ## gArmPlatformTokenSpaceGuid.PcdHobListPtrGlobalOffset|0x0|UINT32|0x00000018\r
 \r

diff --git a/ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
deleted file mode 100644 (file)
index 5c241fa..0000000
--- a/ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/** @file\r
-  PEI Services Table Pointer Library.\r
-\r
-  This library is used for PEIM which does executed from flash device directly but\r
-  executed in memory.\r
-\r
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\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
-#include <PiPei.h>\r
-#include <Library/ArmPlatformGlobalVariableLib.h>\r
-#include <Library/PeiServicesTablePointerLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/PcdLib.h>\r
-\r
-/**\r
-  Caches a pointer PEI Services Table.\r
-\r
-  Caches the pointer to the PEI Services Table specified by PeiServicesTablePointer\r
-  in a platform specific manner.\r
-\r
-  If PeiServicesTablePointer is NULL, then ASSERT().\r
-\r
-  @param    PeiServicesTablePointer   The address of PeiServices pointer.\r
-**/\r
-VOID\r
-EFIAPI\r
-SetPeiServicesTablePointer (\r
-  IN CONST EFI_PEI_SERVICES **PeiServicesTablePointer\r
-  )\r
-{\r
-  ASSERT (PeiServicesTablePointer != NULL);\r
-\r
-  ArmPlatformSetGlobalVariable (PcdGet32 (PcdPeiServicePtrGlobalOffset), sizeof(EFI_PEI_SERVICES **), &PeiServicesTablePointer);\r
-}\r
-\r
-/**\r
-  Retrieves the cached value of the PEI Services Table pointer.\r
-\r
-  Returns the cached value of the PEI Services Table pointer in a CPU specific manner\r
-  as specified in the CPU binding section of the Platform Initialization Pre-EFI\r
-  Initialization Core Interface Specification.\r
-\r
-  If the cached PEI Services Table pointer is NULL, then ASSERT().\r
-\r
-  @return  The pointer to PeiServices.\r
-\r
-**/\r
-CONST EFI_PEI_SERVICES**\r
-EFIAPI\r
-GetPeiServicesTablePointer (\r
-  VOID\r
-  )\r
-{\r
-  EFI_PEI_SERVICES **PeiServicesTablePointer;\r
-\r
-  ArmPlatformGetGlobalVariable (PcdGet32 (PcdPeiServicePtrGlobalOffset), sizeof(EFI_PEI_SERVICES **), &PeiServicesTablePointer);\r
-\r
-  return (CONST EFI_PEI_SERVICES**)PeiServicesTablePointer;\r
-}\r
-\r
-/**\r
-  Perform CPU specific actions required to migrate the PEI Services Table\r
-  pointer from temporary RAM to permanent RAM.\r
-\r
-  For IA32 CPUs, the PEI Services Table pointer is stored in the 4 bytes\r
-  immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
-  For X64 CPUs, the PEI Services Table pointer is stored in the 8 bytes\r
-  immediately preceding the Interrupt Descriptor Table (IDT) in memory.\r
-  For Itanium and ARM CPUs, a the PEI Services Table Pointer is stored in\r
-  a dedicated CPU register.  This means that there is no memory storage\r
-  associated with storing the PEI Services Table pointer, so no additional\r
-  migration actions are required for Itanium or ARM CPUs.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-MigratePeiServicesTablePointer (\r
-  VOID\r
-  )\r
-{\r
-  return;\r
-}\r

diff --git a/ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf b/ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
deleted file mode 100644 (file)
index 307cec8..0000000
--- a/ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
+++ /dev/null
@@ -1,44 +0,0 @@
-## @file\r
-# Instance of PEI Services Table Pointer Library using global variable for the table pointer.\r
-#\r
-# PEI Services Table Pointer Library implementation that retrieves a pointer to the\r
-#  PEI Services Table from a global variable. Not available to modules that execute from\r
-#  read-only memory.\r
-#\r
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\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
-#  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
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = PeiServicesTablePointerLib\r
-  FILE_GUID                      = 1c747f6b-0a58-49ae-8ea3-0327a4fa10e3\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = PeiServicesTablePointerLib|PEIM PEI_CORE SEC\r
-\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
-#\r
-\r
-[Sources]\r
-  PeiServicesTablePointer.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  ArmPlatformPkg/ArmPlatformPkg.dec\r
-\r
-[LibraryClasses]\r
-  ArmPlatformGlobalVariableLib\r
-\r
-[Pcd]\r
-  gArmPlatformTokenSpaceGuid.PcdPeiServicePtrGlobalOffset\r
-\r