ArmPlatformPkg: Replaced 'ArmPlatformTrustzoneSupported' by the fixed Pcd gArmTokenSp...

[mirror_edk2.git] / ArmPkg / ArmPkg.dec

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 170786364a902ceaf3b7c74c3c5e7ba626b41040..710e2151988f8d6db485a1f986b7e189b74ec6bc 100644 (file)
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -2,6 +2,7 @@
 # ARM processor package.\r
 #\r
 # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>\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
@@ -35,12 +36,20 @@
   ArmLib|Include/Library/ArmLib.h\r
   SemihostLib|Include/Library/Semihosting.h\r
   UncachedMemoryAllocationLib|Include/Library/UncachedMemoryAllocationLib.h\r
-  DefaultExceptioHandlerLib|Include/Library/DefaultExceptioHandlerLib.h\r
+  DefaultExceptionHandlerLib|Include/Library/DefaultExceptionHandlerLib.h\r
   ArmDisassemblerLib|Include/Library/ArmDisassemblerLib.h\r
   \r
 [Guids.common]\r
   gArmTokenSpaceGuid       = { 0xBB11ECFE, 0x820F, 0x4968, { 0xBB, 0xA6, 0xF7, 0x6A, 0xFE, 0x30, 0x25, 0x96 } }\r
 \r
+  ## ARM MPCore table\r
+  # Include/Guid/ArmMpCoreInfo.h\r
+  gArmMpCoreInfoGuid = { 0xa4ee0728, 0xe5d7, 0x4ac5,  {0xb2, 0x1e, 0x65, 0x8e, 0xd8, 0x57, 0xe8, 0x34} }\r
+\r
+[Ppis]\r
+  ## Include/Ppi/ArmMpCoreInfo.h\r
+  gArmMpCoreInfoPpiGuid = { 0x6847cc74, 0xe9ec, 0x4f8f, {0xa2, 0x9d, 0xab, 0x44, 0xe7, 0x54, 0xa8, 0xfc} }\r
+\r
 [Protocols.common]\r
   gVirtualUncachedPagesProtocolGuid = { 0xAD651C7D, 0x3C22, 0x4DBF, { 0x92, 0xe8, 0x38, 0xa7, 0xcd, 0xae, 0x87, 0xb2 } }\r
 \r
@@ -57,9 +66,10 @@
   gArmTokenSpaceGuid.PcdDebuggerExceptionSupport|FALSE|BOOLEAN|0x00000032\r
   \r
   gArmTokenSpaceGuid.PcdEfiUncachedMemoryToStronglyOrdered|FALSE|BOOLEAN|0x00000025\r
-  gArmTokenSpaceGuid.PcdSkipPeiCore|FALSE|BOOLEAN|0x00000026\r
 \r
 [PcdsFixedAtBuild.common]\r
+  gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE|BOOLEAN|0x00000006\r
+\r
   # This PCD should be a FeaturePcd. But we used this PCD as an '#if' in an ASM file.\r
   # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor.\r
   gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024\r
@@ -87,10 +97,10 @@
   #\r
   # ARM Normal (or Non Secure) Firmware PCDs\r
   #\r
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress|0|UINT32|0x0000002B\r
-  gArmTokenSpaceGuid.PcdNormalFdSize|0|UINT32|0x0000002C\r
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress|0|UINT32|0x0000002D\r
-  gArmTokenSpaceGuid.PcdNormalFvSize|0|UINT32|0x0000002E\r
+  gArmTokenSpaceGuid.PcdFdBaseAddress|0|UINT32|0x0000002B\r
+  gArmTokenSpaceGuid.PcdFdSize|0|UINT32|0x0000002C\r
+  gArmTokenSpaceGuid.PcdFvBaseAddress|0|UINT32|0x0000002D\r
+  gArmTokenSpaceGuid.PcdFvSize|0|UINT32|0x0000002E\r
 \r
   # System Memory (DRAM): These PCDs define the region of in-built system memory\r
   # Some platforms can get DRAM extensions, these additional regions will be declared\r
@@ -98,15 +108,10 @@
   gArmTokenSpaceGuid.PcdSystemMemoryBase|0|UINT32|0x00000029\r
   gArmTokenSpaceGuid.PcdSystemMemorySize|0|UINT32|0x0000002A\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
+  # Use ClusterId + CoreId to identify the PrimaryCore\r
+  gArmTokenSpaceGuid.PcdArmPrimaryCoreMask|0xF03|UINT32|0x00000031\r
+  # The Primary Core is ClusterId[0] & CoreId[0] \r
+  gArmTokenSpaceGuid.PcdArmPrimaryCore|0|UINT32|0x00000037\r
 \r
   #\r
   # ARM L2x0 PCDs\r