X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ArmPlatformPkg%2FPrePeiCore%2FPrePeiCoreMPCore.inf;h=e3a31fa7c6f6311f33b8cc57a4c8939666d515ad;hp=39dd89e8007c7bab34debc24d9eb11597f83b021;hb=f33d5d68abc02727dc828c1079e72ab65e1d63af;hpb=4c19ece32a311e64061725c893e7cf0320d4c92a

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index 39dd89e800..e3a31fa7c6 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -1,35 +1,45 @@
 #/** @file
 #  Pre PeiCore - Hand-off to PEI Core in Normal World
-#  
-#  Copyright (c) 2011-2012, 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]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = ArmPlatformPrePeiCore
-  FILE_GUID                      = 469fc080-aec1-11df-927c-0002a5d5c51b
+  FILE_GUID                      = b78d02bb-d0b5-4389-bc7f-b39ee846c784
   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
@@ -49,7 +59,6 @@
 
 [Ppis]
   gEfiTemporaryRamSupportPpiGuid
-  gArmGlobalVariablePpiGuid
   gArmMpCoreInfoPpiGuid
 
 [FeaturePcd]
@@ -59,15 +68,12 @@
   gArmTokenSpaceGuid.PcdFvBaseAddress
   gArmTokenSpaceGuid.PcdFvSize
 
-  gArmTokenSpaceGuid.PcdArmPrimaryCoreMask
-  gArmTokenSpaceGuid.PcdArmPrimaryCore
-
   gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase
   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize
   gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize
-  
-  gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize
-  
+
   gArmTokenSpaceGuid.PcdGicDistributorBase
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
   gArmTokenSpaceGuid.PcdGicSgiIntId
+
+  gEfiMdeModulePkgTokenSpaceGuid.PcdInitValueInTempStack