ArmPkg: Removed deprecated 'ArmMPCoreMailBoxLib'

This library has been replaced by ArmMpCoreInfo PPI and HOBs.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12424 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index d28d78316040700511764bb00247aa32d9ebd39e..bc14660e361f2f0c5810b3f91efb82550f723aba 100644 (file)
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -111,16 +111,6 @@
   # The Primary Core is ClusterId[0] & CoreId[0] \r
   gArmTokenSpaceGuid.PcdArmPrimaryCore|0|UINT32|0x00000037\r
 \r
-  #\r
-  # ARM MPCore MailBox PCDs\r
-  #\r
-  # Address to Set/Get to Mailbox in Multicore system\r
-  gArmTokenSpaceGuid.PcdMPCoreMailboxSetAddress|0|UINT32|0x00000017\r
-  gArmTokenSpaceGuid.PcdMPCoreMailboxGetAddress|0|UINT32|0x00000018\r
-  # Address/Value to clear Mailbox in Multicore system\r
-  gArmTokenSpaceGuid.PcdMPCoreMailboxClearAddress|0|UINT32|0x00000019\r
-  gArmTokenSpaceGuid.PcdMPCoreMailboxClearValue|0|UINT32|0x0000001A\r
-\r
   #\r
   # ARM L2x0 PCDs\r
   #\r

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 5eced599aa848d794d0da782e6957633f32fc011..d08f1ae786e9c0ea2e54082d0ea699b5bff07c22 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -69,7 +69,6 @@
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
   ArmTrustZoneLib|ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf
-  ArmMPCoreMailBoxLib|ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf
   
   BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
   
@@ -101,7 +100,6 @@
   ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLibPrePi.inf
   ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLibSec.inf
   ArmPkg/Library/ArmLib/Null/NullArmLib.inf
-  ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf
   ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf
   ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf
   ArmPkg/Library/BaseMemoryLibVstm/BaseMemoryLibVstm.inf

diff --git a/ArmPkg/Include/Library/ArmMPCoreMailBoxLib.h b/ArmPkg/Include/Library/ArmMPCoreMailBoxLib.h
deleted file mode 100644 (file)
index 1588c31..0000000
--- a/ArmPkg/Include/Library/ArmMPCoreMailBoxLib.h
+++ /dev/null
@@ -1,22 +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_MPCORE_MAILBOX_LIB_H_\r
-#define _ARM_MPCORE_MAILBOX_LIB_H_\r
-\r
-VOID ArmClearMPCoreMailbox(VOID);\r
-\r
-UINTN ArmGetMPCoreMailbox(VOID);\r
-\r
-#endif\r

diff --git a/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBox.c b/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBox.c
deleted file mode 100644 (file)
index 28edd67..0000000
--- a/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBox.c
+++ /dev/null
@@ -1,33 +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
-#include <Library/ArmMPCoreMailBoxLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/IoLib.h>\r
-\r
-VOID\r
-ArmClearMPCoreMailbox (\r
-  VOID\r
-  )\r
-{\r
-  MmioWrite32(PcdGet32(PcdMPCoreMailboxClearAddress),PcdGet32(PcdMPCoreMailboxClearValue));\r
-}\r
-\r
-UINTN\r
-ArmGetMPCoreMailbox (\r
-  VOID\r
-  )\r
-{\r
-  return MmioRead32(PcdGet32(PcdMPCoreMailboxGetAddress));\r
-}\r

diff --git a/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf b/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf
deleted file mode 100644 (file)
index 9003f1d..0000000
--- a/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf
+++ /dev/null
@@ -1,37 +0,0 @@
-#/* @file\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
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = ArmMPCoreMailBoxLib\r
-  FILE_GUID                      = de76d780-f422-11df-967a-0002a5d5c51b\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = ArmMPCoreMailBoxLib\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  ArmPkg/ArmPkg.dec\r
-\r
-[LibraryClasses]\r
-  IoLib\r
-\r
-[Sources.common]\r
-  ArmMPCoreMailBox.c\r
-\r
-[Protocols]\r
-\r
-[FixedPcd]\r
-  gArmTokenSpaceGuid.PcdMPCoreMailboxGetAddress\r
-  gArmTokenSpaceGuid.PcdMPCoreMailboxClearAddress\r
-  gArmTokenSpaceGuid.PcdMPCoreMailboxClearValue\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index 9d6212424712e3696fdb7808fd7a0e2d6ae060fa..7d65f65388584568aa2718603f3c84594ea4b595 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -40,7 +40,6 @@
 \r
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLib.inf\r
   ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf\r
-  ArmMPCoreMailBoxLib|ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf\r
   \r
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf\r
   BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf\r
@@ -417,15 +416,6 @@
   #\r
   gArmTokenSpaceGuid.PcdL2x0ControllerBase|0x1F002000\r
  \r
-  #\r
-  # ARM VE MP Core Mailbox\r
-  #\r
-  gArmTokenSpaceGuid.PcdMPCoreMailboxSetAddress|0x10000030\r
-  gArmTokenSpaceGuid.PcdMPCoreMailboxGetAddress|0x10000030\r
-  gArmTokenSpaceGuid.PcdMPCoreMailboxClearAddress|0x10000034\r
-  gArmTokenSpaceGuid.PcdMPCoreMailboxClearValue|0xFFFFFFFF\r
-\r
-\r
 ################################################################################\r
 #\r
 # Components Section - list of all EDK II Modules needed by this Platform\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 6930339fa0e8d90925b827210bada665f7f47e60..61acb6ccdd4aa8bcea5671dd17be7e25ec8a9cb8 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -45,7 +45,6 @@
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLib.inf
   ArmPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf
   ArmTrustZoneLib|ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf
-  ArmMPCoreMailBoxLib|ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf
   
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
   BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf
@@ -463,15 +462,6 @@
   #
   gArmTokenSpaceGuid.PcdL2x0ControllerBase|0x1E00A000
 
-  #
-  # ARM VE MP Core Mailbox
-  #
-  gArmTokenSpaceGuid.PcdMPCoreMailboxSetAddress|0x10000030
-  gArmTokenSpaceGuid.PcdMPCoreMailboxGetAddress|0x10000030
-  gArmTokenSpaceGuid.PcdMPCoreMailboxClearAddress|0x10000034
-  gArmTokenSpaceGuid.PcdMPCoreMailboxClearValue|0xFFFFFFFF
-
-
 ################################################################################
 #
 # Components Section - list of all EDK II Modules needed by this Platform

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index 692a617ce20fb362e5eaf6cde20199d567915282..8e812199f6a4d10d2e8676906b62799784248873 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -39,7 +39,6 @@
 [LibraryClasses]\r
   ArmLib\r
   ArmPlatformLib\r
-  ArmMPCoreMailBoxLib\r
   BaseLib\r
   DebugLib\r
   DebugAgentLib\r

diff --git a/ArmPlatformPkg/PrePi/MainMPCore.c b/ArmPlatformPkg/PrePi/MainMPCore.c
index 139b60289eee749a31cb4ae3bffea919860f629b..d0a6cc3dedfe73ee074d8e517daac749dd8e5e64 100644 (file)
--- a/ArmPlatformPkg/PrePi/MainMPCore.c
+++ b/ArmPlatformPkg/PrePi/MainMPCore.c
@@ -15,7 +15,6 @@
 #include "PrePi.h"\r
 \r
 #include <Library/ArmGicLib.h>\r
-#include <Library/ArmMPCoreMailBoxLib.h>\r
 #include <Chipset/ArmV7.h>\r
 \r
 VOID\r

diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
index 9d580e6cf480646eb461640d6745dcf4e743a776..81722c1123ccc9de7904c4f5b34a455956146fe4 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
@@ -39,7 +39,6 @@
   DebugLib\r
   DebugAgentLib\r
   ArmLib\r
-  ArmMPCoreMailBoxLib\r
   ArmGicLib\r
   IoLib\r
   TimerLib\r