From: oliviermartin Date: Thu, 22 Sep 2011 23:16:04 +0000 (+0000) Subject: ArmPkg: Removed deprecated 'ArmMPCoreMailBoxLib' X-Git-Tag: edk2-stable201903~14156 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=1d2bbdbb8d38b835a9b0e15fec65a045067f580f 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 d28d783160..bc14660e36 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -111,16 +111,6 @@ # The Primary Core is ClusterId[0] & CoreId[0] gArmTokenSpaceGuid.PcdArmPrimaryCore|0|UINT32|0x00000037 - # - # ARM MPCore MailBox PCDs - # - # Address to Set/Get to Mailbox in Multicore system - gArmTokenSpaceGuid.PcdMPCoreMailboxSetAddress|0|UINT32|0x00000017 - gArmTokenSpaceGuid.PcdMPCoreMailboxGetAddress|0|UINT32|0x00000018 - # Address/Value to clear Mailbox in Multicore system - gArmTokenSpaceGuid.PcdMPCoreMailboxClearAddress|0|UINT32|0x00000019 - gArmTokenSpaceGuid.PcdMPCoreMailboxClearValue|0|UINT32|0x0000001A - # # ARM L2x0 PCDs # diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 5eced599aa..d08f1ae786 100644 --- 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 index 1588c31782..0000000000 --- a/ArmPkg/Include/Library/ArmMPCoreMailBoxLib.h +++ /dev/null @@ -1,22 +0,0 @@ -/** @file -* -* Copyright (c) 2011, ARM Limited. All rights reserved. -* -* This program and the accompanying materials -* are licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php -* -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -* -**/ - -#ifndef _ARM_MPCORE_MAILBOX_LIB_H_ -#define _ARM_MPCORE_MAILBOX_LIB_H_ - -VOID ArmClearMPCoreMailbox(VOID); - -UINTN ArmGetMPCoreMailbox(VOID); - -#endif diff --git a/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBox.c b/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBox.c deleted file mode 100644 index 28edd674c0..0000000000 --- a/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBox.c +++ /dev/null @@ -1,33 +0,0 @@ -/** @file -* -* Copyright (c) 2011, ARM Limited. All rights reserved. -* -* This program and the accompanying materials -* are licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php -* -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -* -**/ - -#include -#include -#include - -VOID -ArmClearMPCoreMailbox ( - VOID - ) -{ - MmioWrite32(PcdGet32(PcdMPCoreMailboxClearAddress),PcdGet32(PcdMPCoreMailboxClearValue)); -} - -UINTN -ArmGetMPCoreMailbox ( - VOID - ) -{ - return MmioRead32(PcdGet32(PcdMPCoreMailboxGetAddress)); -} diff --git a/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf b/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf deleted file mode 100644 index 9003f1db2f..0000000000 --- a/ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf +++ /dev/null @@ -1,37 +0,0 @@ -#/* @file -# Copyright (c) 2011, ARM Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -#*/ - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = ArmMPCoreMailBoxLib - FILE_GUID = de76d780-f422-11df-967a-0002a5d5c51b - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = ArmMPCoreMailBoxLib - -[Packages] - MdePkg/MdePkg.dec - ArmPkg/ArmPkg.dec - -[LibraryClasses] - IoLib - -[Sources.common] - ArmMPCoreMailBox.c - -[Protocols] - -[FixedPcd] - gArmTokenSpaceGuid.PcdMPCoreMailboxGetAddress - gArmTokenSpaceGuid.PcdMPCoreMailboxClearAddress - gArmTokenSpaceGuid.PcdMPCoreMailboxClearValue diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc index 9d62124247..7d65f65388 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc +++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc @@ -40,7 +40,6 @@ ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLib.inf ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf - ArmMPCoreMailBoxLib|ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf BaseLib|MdePkg/Library/BaseLib/BaseLib.inf BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf @@ -417,15 +416,6 @@ # gArmTokenSpaceGuid.PcdL2x0ControllerBase|0x1F002000 - # - # 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/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc index 6930339fa0..61acb6ccdd 100644 --- 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 692a617ce2..8e812199f6 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf @@ -39,7 +39,6 @@ [LibraryClasses] ArmLib ArmPlatformLib - ArmMPCoreMailBoxLib BaseLib DebugLib DebugAgentLib diff --git a/ArmPlatformPkg/PrePi/MainMPCore.c b/ArmPlatformPkg/PrePi/MainMPCore.c index 139b60289e..d0a6cc3ded 100644 --- a/ArmPlatformPkg/PrePi/MainMPCore.c +++ b/ArmPlatformPkg/PrePi/MainMPCore.c @@ -15,7 +15,6 @@ #include "PrePi.h" #include -#include #include VOID diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf index 9d580e6cf4..81722c1123 100755 --- a/ArmPlatformPkg/PrePi/PeiMPCore.inf +++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf @@ -39,7 +39,6 @@ DebugLib DebugAgentLib ArmLib - ArmMPCoreMailBoxLib ArmGicLib IoLib TimerLib