ArmPlatformPkg: remove all ArmPlatformGlobalVariableLib implementations

This removes the SEC, PEI and DXE variants of ArmPlatformGlobalVariableLib,
which is no longer used, and should not be used since it violates the PI
spec.

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

diff --git a/ArmPlatformPkg/Include/Library/ArmPlatformGlobalVariableLib.h b/ArmPlatformPkg/Include/Library/ArmPlatformGlobalVariableLib.h
deleted file mode 100644 (file)
index b1a080c..0000000
--- a/ArmPlatformPkg/Include/Library/ArmPlatformGlobalVariableLib.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/** @file\r
-*\r
-*  Copyright (c) 2011-2012, 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_PLATFORM_GLOBAL_VARIABLE_LIB_H_\r
-#define __ARM_PLATFORM_GLOBAL_VARIABLE_LIB_H_\r
-\r
-VOID\r
-ArmPlatformGetGlobalVariable (\r
-  IN  UINTN     VariableOffset,\r
-  IN  UINTN     VariableSize,\r
-  OUT VOID*     Variable\r
-  );\r
-\r
-VOID\r
-ArmPlatformSetGlobalVariable (\r
-  IN  UINTN     VariableOffset,\r
-  IN  UINTN     VariableSize,\r
-  OUT VOID*     Variable\r
-  );\r
-\r
-VOID*\r
-ArmPlatformGetGlobalVariableAddress (\r
-  IN  UINTN     VariableOffset\r
-  );\r
-\r
-#endif\r
-\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Dxe/DxeArmPlatformGlobalVariableLib.c b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Dxe/DxeArmPlatformGlobalVariableLib.c
deleted file mode 100644 (file)
index 511d0f6..0000000
--- a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Dxe/DxeArmPlatformGlobalVariableLib.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/** @file\r
-*\r
-*  Copyright (c) 2011-2012, 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
-#include <PiDxe.h>\r
-#include <Library/ArmPlatformGlobalVariableLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/HobLib.h>\r
-#include <Library/PcdLib.h>\r
-\r
-#include <Guid/ArmGlobalVariableHob.h>\r
-\r
-UINTN  mGlobalVariableBase = 0;\r
-\r
-RETURN_STATUS\r
-EFIAPI\r
-ArmPlatformGlobalVariableConstructor (\r
-  VOID\r
-  )\r
-{\r
-  ARM_HOB_GLOBAL_VARIABLE  *Hob;\r
-\r
-  Hob = GetFirstGuidHob (&gArmGlobalVariableGuid);\r
-  ASSERT (Hob != NULL);\r
-\r
-  mGlobalVariableBase = Hob->GlobalVariableBase;\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-VOID\r
-ArmPlatformGetGlobalVariable (\r
-  IN  UINTN     VariableOffset,\r
-  IN  UINTN     VariableSize,\r
-  OUT VOID*     Variable\r
-  )\r
-{\r
-  if (mGlobalVariableBase == 0) {\r
-    ArmPlatformGlobalVariableConstructor ();\r
-  }\r
-\r
-  CopyMem (Variable, (VOID*)(mGlobalVariableBase + VariableOffset), VariableSize);\r
-}\r
-\r
-VOID\r
-ArmPlatformSetGlobalVariable (\r
-  IN  UINTN     VariableOffset,\r
-  IN  UINTN     VariableSize,\r
-  OUT VOID*     Variable\r
-  )\r
-{\r
-  if (mGlobalVariableBase == 0) {\r
-    ArmPlatformGlobalVariableConstructor ();\r
-  }\r
-\r
-  CopyMem ((VOID*)(mGlobalVariableBase + VariableOffset), Variable, VariableSize);\r
-}\r
-\r
-VOID*\r
-ArmPlatformGetGlobalVariableAddress (\r
-  IN  UINTN     VariableOffset\r
-  )\r
-{\r
-  return (VOID*)(mGlobalVariableBase + VariableOffset);\r
-}\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Dxe/DxeArmPlatformGlobalVariableLib.inf b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Dxe/DxeArmPlatformGlobalVariableLib.inf
deleted file mode 100644 (file)
index e90d6a5..0000000
--- a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Dxe/DxeArmPlatformGlobalVariableLib.inf
+++ /dev/null
@@ -1,44 +0,0 @@
-#/** @file\r
-# Timer library implementation\r
-#\r
-#\r
-#  Copyright (c) 2011-2012, ARM Ltd. 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
-#\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
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = DxeArmPlatformGlobalVariableLib\r
-  FILE_GUID                      = 53fa3cc3-23b7-4ec2-9bfa-30257d7e1135\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = ArmPlatformGlobalVariableLib\r
-\r
-  CONSTRUCTOR                    = ArmPlatformGlobalVariableConstructor\r
-\r
-[Sources.common]\r
-  DxeArmPlatformGlobalVariableLib.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  ArmPlatformPkg/ArmPlatformPkg.dec\r
-\r
-[LibraryClasses]\r
-  BaseLib\r
-  DebugLib\r
-  HobLib\r
-\r
-[Guids]\r
-  gArmGlobalVariableGuid\r
-\r
-[FixedPcd]\r
-  gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize\r
-\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.c b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.c
deleted file mode 100644 (file)
index 2ffbdbe..0000000
--- a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/** @file\r
-*\r
-*  Copyright (c) 2011-2012, 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
-#include <Uefi.h>\r
-#include <Library/ArmPlatformGlobalVariableLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-// Declared by ArmPlatformPkg/PrePi Module\r
-extern UINTN mGlobalVariableBase;\r
-\r
-VOID\r
-ArmPlatformGetGlobalVariable (\r
-  IN  UINTN     VariableOffset,\r
-  IN  UINTN     VariableSize,\r
-  OUT VOID*     Variable\r
-  )\r
-{\r
-  UINTN  GlobalVariableBase;\r
-\r
-  // Ensure the Global Variable Size have been initialized\r
-  ASSERT (VariableOffset < PcdGet32 (PcdPeiGlobalVariableSize));\r
-\r
-  GlobalVariableBase = PcdGet64 (PcdCPUCoresStackBase) + PcdGet32 (PcdCPUCorePrimaryStackSize) - PcdGet32 (PcdPeiGlobalVariableSize);\r
-\r
-  if (VariableSize == 4) {\r
-    *(UINT32*)Variable = ReadUnaligned32 ((CONST UINT32*)(GlobalVariableBase + VariableOffset));\r
-  } else if (VariableSize == 8) {\r
-    *(UINT64*)Variable = ReadUnaligned64 ((CONST UINT64*)(GlobalVariableBase + VariableOffset));\r
-  } else {\r
-    CopyMem (Variable, (VOID*)(GlobalVariableBase + VariableOffset), VariableSize);\r
-  }\r
-}\r
-\r
-VOID\r
-ArmPlatformSetGlobalVariable (\r
-  IN  UINTN     VariableOffset,\r
-  IN  UINTN     VariableSize,\r
-  OUT VOID*     Variable\r
-  )\r
-{\r
-  UINTN  GlobalVariableBase;\r
-\r
-  // Ensure the Global Variable Size have been initialized\r
-  ASSERT (VariableOffset < PcdGet32 (PcdPeiGlobalVariableSize));\r
-\r
-  GlobalVariableBase = PcdGet64 (PcdCPUCoresStackBase) + PcdGet32 (PcdCPUCorePrimaryStackSize) - PcdGet32 (PcdPeiGlobalVariableSize);\r
-\r
-  if (VariableSize == 4) {\r
-    WriteUnaligned32 ((UINT32*)(GlobalVariableBase + VariableOffset), *(UINT32*)Variable);\r
-  } else if (VariableSize == 8) {\r
-    WriteUnaligned64 ((UINT64*)(GlobalVariableBase + VariableOffset), *(UINT64*)Variable);\r
-  } else {\r
-    CopyMem ((VOID*)(GlobalVariableBase + VariableOffset), Variable, VariableSize);\r
-  }\r
-}\r
-\r
-VOID*\r
-ArmPlatformGetGlobalVariableAddress (\r
-  IN  UINTN     VariableOffset\r
-  )\r
-{\r
-  UINTN  GlobalVariableBase;\r
-\r
-  // Ensure the Global Variable Size have been initialized\r
-  ASSERT (VariableOffset < PcdGet32 (PcdPeiGlobalVariableSize));\r
-\r
-  GlobalVariableBase = PcdGet64 (PcdCPUCoresStackBase) + PcdGet32 (PcdCPUCorePrimaryStackSize) - PcdGet32 (PcdPeiGlobalVariableSize);\r
-\r
-  return (VOID*)(GlobalVariableBase + VariableOffset);\r
-}\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf
deleted file mode 100644 (file)
index 09995e1..0000000
--- a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf
+++ /dev/null
@@ -1,40 +0,0 @@
-#/** @file\r
-# ArmPlatformGlobalVariableLib library implementation\r
-#\r
-#  Copyright (c) 2011-2012, ARM Ltd. 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
-#\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
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = PeiArmPlatformGlobalVariableLib\r
-  FILE_GUID                      = 3e03daf2-b7b4-45f7-80b2-12aba043391f\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = ArmPlatformGlobalVariableLib\r
-\r
-[Sources.common]\r
-  PeiArmPlatformGlobalVariableLib.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  ArmPlatformPkg/ArmPlatformPkg.dec\r
-\r
-[LibraryClasses]\r
-  BaseLib\r
-  DebugLib\r
-  PcdLib\r
-\r
-[FixedPcd]\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize\r
-  gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize\r
-\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.c b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.c
deleted file mode 100644 (file)
index db69ba0..0000000
--- a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/** @file\r
-*\r
-*  Copyright (c) 2011-2015, 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
-#include <Uefi.h>\r
-#include <Library/ArmPlatformGlobalVariableLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-extern UINT64 mSystemMemoryEnd;\r
-\r
-#define IS_XIP() (((UINT32)PcdGet64 (PcdFdBaseAddress) > (UINT32)(mSystemMemoryEnd)) || \\r
-                  ((PcdGet64 (PcdFdBaseAddress) + PcdGet32 (PcdFdSize)) < PcdGet64 (PcdSystemMemoryBase)))\r
-\r
-// Declared by ArmPlatformPkg/PrePi Module\r
-extern UINTN mGlobalVariableBase;\r
-\r
-VOID\r
-ArmPlatformGetGlobalVariable (\r
-  IN  UINTN     VariableOffset,\r
-  IN  UINTN     VariableSize,\r
-  OUT VOID*     Variable\r
-  )\r
-{\r
-  UINTN  GlobalVariableBase;\r
-\r
-  // Ensure the Global Variable Size have been initialized\r
-  ASSERT (VariableOffset < PcdGet32 (PcdPeiGlobalVariableSize));\r
-\r
-  if (IS_XIP()) {\r
-    // In Case of XIP, we expect the Primary Stack at the top of the System Memory\r
-    // The size must be 64bit aligned to allow 64bit variable to be aligned\r
-    GlobalVariableBase = mSystemMemoryEnd + 1 - ALIGN_VALUE (PcdGet32 (PcdPeiGlobalVariableSize), 0x8);\r
-  } else {\r
-    GlobalVariableBase = mGlobalVariableBase;\r
-  }\r
-\r
-  if (VariableSize == 4) {\r
-    *(UINT32*)Variable = ReadUnaligned32 ((CONST UINT32*)(GlobalVariableBase + VariableOffset));\r
-  } else if (VariableSize == 8) {\r
-    *(UINT64*)Variable = ReadUnaligned64 ((CONST UINT64*)(GlobalVariableBase + VariableOffset));\r
-  } else {\r
-    CopyMem (Variable, (VOID*)(GlobalVariableBase + VariableOffset), VariableSize);\r
-  }\r
-}\r
-\r
-VOID\r
-ArmPlatformSetGlobalVariable (\r
-  IN  UINTN     VariableOffset,\r
-  IN  UINTN     VariableSize,\r
-  OUT VOID*     Variable\r
-  )\r
-{\r
-  UINTN  GlobalVariableBase;\r
-\r
-  // Ensure the Global Variable Size have been initialized\r
-  ASSERT (VariableOffset < PcdGet32 (PcdPeiGlobalVariableSize));\r
-\r
-  if (IS_XIP()) {\r
-    // In Case of XIP, we expect the Primary Stack at the top of the System Memory\r
-    // The size must be 64bit aligned to allow 64bit variable to be aligned\r
-    GlobalVariableBase = mSystemMemoryEnd + 1 - ALIGN_VALUE (PcdGet32 (PcdPeiGlobalVariableSize), 0x8);\r
-  } else {\r
-    GlobalVariableBase = mGlobalVariableBase;\r
-  }\r
-\r
-  if (VariableSize == 4) {\r
-    WriteUnaligned32 ((UINT32*)(GlobalVariableBase + VariableOffset), *(UINT32*)Variable);\r
-  } else if (VariableSize == 8) {\r
-    WriteUnaligned64 ((UINT64*)(GlobalVariableBase + VariableOffset), *(UINT64*)Variable);\r
-  } else {\r
-    CopyMem ((VOID*)(GlobalVariableBase + VariableOffset), Variable, VariableSize);\r
-  }\r
-}\r
-\r
-VOID*\r
-ArmPlatformGetGlobalVariableAddress (\r
-  IN  UINTN     VariableOffset\r
-  )\r
-{\r
-  UINTN  GlobalVariableBase;\r
-\r
-  // Ensure the Global Variable Size have been initialized\r
-  ASSERT (VariableOffset < PcdGet32 (PcdPeiGlobalVariableSize));\r
-\r
-  if (IS_XIP()) {\r
-    // In Case of XIP, we expect the Primary Stack at the top of the System Memory\r
-    // The size must be 64bit aligned to allow 64bit variable to be aligned\r
-    GlobalVariableBase = mSystemMemoryEnd + 1 - ALIGN_VALUE (PcdGet32 (PcdPeiGlobalVariableSize), 0x8);\r
-  } else {\r
-    GlobalVariableBase = mGlobalVariableBase;\r
-  }\r
-\r
-  return (VOID*)(GlobalVariableBase + VariableOffset);\r
-}\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf
deleted file mode 100644 (file)
index 1b5b8fc..0000000
--- a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf
+++ /dev/null
@@ -1,44 +0,0 @@
-#/** @file\r
-#\r
-#  Copyright (c) 2011-2015, ARM Ltd. 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
-#\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
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = PrePiArmPlatformGlobalVariableLib\r
-  FILE_GUID                      = 44d59470-e5e6-4811-af00-33bb573a804b\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = ArmPlatformGlobalVariableLib\r
-\r
-[Sources.common]\r
-  PrePiArmPlatformGlobalVariableLib.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  ArmPlatformPkg/ArmPlatformPkg.dec\r
-  ArmPkg/ArmPkg.dec\r
-\r
-[LibraryClasses]\r
-  BaseLib\r
-  DebugLib\r
-  PcdLib\r
-\r
-[FixedPcd]\r
-  gArmTokenSpaceGuid.PcdFdSize\r
-\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize\r
-  gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize\r
-\r
-[Pcd]\r
-  gArmTokenSpaceGuid.PcdSystemMemoryBase\r
-  gArmTokenSpaceGuid.PcdFdBaseAddress\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Sec/SecArmPlatformGlobalVariableLib.c b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Sec/SecArmPlatformGlobalVariableLib.c
deleted file mode 100644 (file)
index aa8d892..0000000
--- a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Sec/SecArmPlatformGlobalVariableLib.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/** @file\r
-*\r
-*  Copyright (c) 2011-2012, 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
-#include <Uefi.h>\r
-#include <Library/ArmPlatformGlobalVariableLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-VOID\r
-ArmPlatformGetGlobalVariable (\r
-  IN  UINTN     VariableOffset,\r
-  IN  UINTN     VariableSize,\r
-  OUT VOID*     Variable\r
-  )\r
-{\r
-  UINTN  GlobalVariableBase;\r
-\r
-  // Ensure the Global Variable Size have been initialized\r
-  ASSERT (VariableOffset < PcdGet32 (PcdSecGlobalVariableSize));\r
-\r
-  GlobalVariableBase = PcdGet32 (PcdCPUCoresSecStackBase) + PcdGet32 (PcdCPUCoreSecPrimaryStackSize) - PcdGet32 (PcdSecGlobalVariableSize);\r
-\r
-  if (VariableSize == 4) {\r
-    *(UINT32*)Variable = ReadUnaligned32 ((CONST UINT32*)(GlobalVariableBase + VariableOffset));\r
-  } else if (VariableSize == 8) {\r
-    *(UINT64*)Variable = ReadUnaligned64 ((CONST UINT64*)(GlobalVariableBase + VariableOffset));\r
-  } else {\r
-    CopyMem (Variable, (VOID*)(GlobalVariableBase + VariableOffset), VariableSize);\r
-  }\r
-}\r
-\r
-VOID\r
-ArmPlatformSetGlobalVariable (\r
-  IN  UINTN     VariableOffset,\r
-  IN  UINTN     VariableSize,\r
-  OUT VOID*     Variable\r
-  )\r
-{\r
-  UINTN  GlobalVariableBase;\r
-\r
-  // Ensure the Global Variable Size have been initialized\r
-  ASSERT (VariableOffset < PcdGet32 (PcdSecGlobalVariableSize));\r
-\r
-  GlobalVariableBase = PcdGet32 (PcdCPUCoresSecStackBase) + PcdGet32 (PcdCPUCoreSecPrimaryStackSize) - PcdGet32 (PcdSecGlobalVariableSize);\r
-\r
-  if (VariableSize == 4) {\r
-    WriteUnaligned32 ((UINT32*)(GlobalVariableBase + VariableOffset), *(UINT32*)Variable);\r
-  } else if (VariableSize == 8) {\r
-    WriteUnaligned64 ((UINT64*)(GlobalVariableBase + VariableOffset), *(UINT64*)Variable);\r
-  } else {\r
-    CopyMem ((VOID*)(GlobalVariableBase + VariableOffset), Variable, VariableSize);\r
-  }\r
-}\r
-\r
-VOID*\r
-ArmPlatformGetGlobalVariableAddress (\r
-  IN  UINTN     VariableOffset\r
-  )\r
-{\r
-  UINTN  GlobalVariableBase;\r
-\r
-  // Ensure the Global Variable Size have been initialized\r
-  ASSERT (VariableOffset < PcdGet32 (PcdSecGlobalVariableSize));\r
-\r
-  GlobalVariableBase = PcdGet32 (PcdCPUCoresSecStackBase) + PcdGet32 (PcdCPUCoreSecPrimaryStackSize) - PcdGet32 (PcdSecGlobalVariableSize);\r
-\r
-  return (VOID*)(GlobalVariableBase + VariableOffset);\r
-}\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Sec/SecArmPlatformGlobalVariableLib.inf b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Sec/SecArmPlatformGlobalVariableLib.inf
deleted file mode 100644 (file)
index d64cbaf..0000000
--- a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Sec/SecArmPlatformGlobalVariableLib.inf
+++ /dev/null
@@ -1,39 +0,0 @@
-#/** @file\r
-#\r
-#  Copyright (c) 2011-2012, ARM Ltd. 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
-#\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
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = SecArmPlatformGlobalVariableLib\r
-  FILE_GUID                      = e01f4944-df86-488b-b89b-79e7a53a3a5d\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = ArmPlatformGlobalVariableLib\r
-\r
-[Sources.common]\r
-  SecArmPlatformGlobalVariableLib.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  ArmPlatformPkg/ArmPlatformPkg.dec\r
-\r
-[LibraryClasses]\r
-  BaseLib\r
-  DebugLib\r
-  PcdLib\r
-\r
-[FixedPcd]\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecPrimaryStackSize\r
-  gArmPlatformTokenSpaceGuid.PcdSecGlobalVariableSize\r
-\r