X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ArmPlatformPkg%2FPrePeiCore%2FPrePeiCoreMPCore.inf;h=5ba0231a3e4bad26001399954fa32ca8213445d4;hb=18744a5f611f42c325483ffea83ce216bededc7a;hp=25dae0fb9ede1c5d9e839dcbd69b7ddb862bcf0b;hpb=0787bc6184631f20f8bf3b4abd61630a4a9bc672;p=mirror_edk2.git

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index 25dae0fb9e..5ba0231a3e 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -1,16 +1,16 @@
 #/** @file
 #  Pre PeiCore - Hand-off to PEI Core in Normal World
-#  
-#  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.             
-#  
+#  Copyright (c) 2011-2014, 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]
@@ -20,16 +20,26 @@
   MODULE_TYPE                    = SEC
   VERSION_STRING                 = 1.0
 
-[Sources.ARM]
-  PrePeiCoreEntryPoint.asm | RVCT
-  PrePeiCoreEntryPoint.S   | GCC
-  PrePeiCore.c
+[Sources.common]
   MainMPCore.c
-  SwitchStack.asm      | RVCT
-  SwitchStack.S        | GCC
-  Exception.asm        | RVCT
-  Exception.S          | GCC
-  
+  PrePeiCore.c
+
+[Sources.ARM]
+  Arm/ArchPrePeiCore.c
+  Arm/PrePeiCoreEntryPoint.asm | RVCT
+  Arm/PrePeiCoreEntryPoint.S   | GCC
+  Arm/SwitchStack.asm      | RVCT
+  Arm/SwitchStack.S        | GCC
+  Arm/Exception.asm        | RVCT
+  Arm/Exception.S          | GCC
+
+[Sources.AARCH64]
+  AArch64/ArchPrePeiCore.c
+  AArch64/PrePeiCoreEntryPoint.S
+  AArch64/SwitchStack.S
+  AArch64/Exception.S
+  AArch64/Helper.S
+
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
@@ -39,7 +49,6 @@
 [LibraryClasses]
   ArmLib
   ArmPlatformLib
-  ArmMPCoreMailBoxLib
   BaseLib
   DebugLib
   DebugAgentLib
@@ -50,21 +59,22 @@
 
 [Ppis]
   gEfiTemporaryRamSupportPpiGuid
+  gArmGlobalVariablePpiGuid
+  gArmMpCoreInfoPpiGuid
 
 [FeaturePcd]
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores
 
 [FixedPcd]
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFvSize
+  gArmTokenSpaceGuid.PcdFvBaseAddress
+  gArmTokenSpaceGuid.PcdFvSize
 
-  gArmTokenSpaceGuid.PcdArmPrimaryCoreMask
-  gArmTokenSpaceGuid.PcdArmPrimaryCore
+  gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase
+  gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize
+  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize
 
-  gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackBase
-  gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackSize
-  
   gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize
-  
+
   gArmTokenSpaceGuid.PcdGicDistributorBase
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
+  gArmTokenSpaceGuid.PcdGicSgiIntId