ARM Packages: Replace tabs by spaces for indentation

[mirror_edk2.git] / ArmPlatformPkg / PrePeiCore / Arm / PrePeiCoreEntryPoint.asm

diff --git a/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
index 3b756b492a565d21f185237954ad2dc1a2828749..edf479ff43e5ff56acc881334db4ef8fd469953f 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
+++ b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
@@ -1,13 +1,13 @@
 //\r
 //  Copyright (c) 2011-2013, 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
+//  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
@@ -17,25 +17,30 @@
 #include <AutoGen.h>\r
 \r
   INCLUDE AsmMacroIoLib.inc\r
-  \r
+\r
   IMPORT  CEntryPoint\r
+  IMPORT  ArmPlatformGetCorePosition\r
   IMPORT  ArmPlatformIsPrimaryCore\r
   IMPORT  ArmReadMpidr\r
+  IMPORT  ArmPlatformPeiBootAction\r
   EXPORT  _ModuleEntryPoint\r
-  \r
+\r
   PRESERVE8\r
   AREA    PrePeiCoreEntryPoint, CODE, READONLY\r
-  \r
+\r
 StartupAddr        DCD      CEntryPoint\r
 \r
 _ModuleEntryPoint\r
+  // Do early platform specific actions\r
+  bl    ArmPlatformPeiBootAction\r
+\r
   // Identify CPU ID\r
   bl    ArmReadMpidr\r
   // Keep a copy of the MpId register value\r
   mov   r5, r0\r
-  \r
+\r
   // Is it the Primary Core ?\r
-  bl   ArmPlatformIsPrimaryCore\r
+  bl    ArmPlatformIsPrimaryCore\r
 \r
   // Get the top of the primary stacks (and the base of the secondary stacks)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoresStackBase), r1)\r
@@ -49,8 +54,10 @@ _ModuleEntryPoint
 _SetupSecondaryCoreStack\r
   // r1 contains the base of the secondary stacks\r
 \r
-  // Get the Core Position (ClusterId * 4) + CoreId\r
-  GetCorePositionFromMpId(r0, r5, r2)\r
+  // Get the Core Position\r
+  mov   r6, r1      // Save base of the secondary stacks\r
+  mov   r0, r5\r
+  bl    ArmPlatformGetCorePosition\r
   // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack\r
   add   r0, r0, #1\r
 \r
@@ -58,7 +65,7 @@ _SetupSecondaryCoreStack
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r2)\r
   mul   r0, r0, r2\r
   // SP = StackBase + StackOffset\r
-  add   sp, r1, r0\r
+  add   sp, r6, r0\r
 \r
 _PrepareArguments\r
   // The PEI Core Entry Point has been computed by GenFV and stored in the second entry of the Reset Vector\r
@@ -69,7 +76,7 @@ _PrepareArguments
   // Move sec startup address into a data register\r
   // Ensure we're jumping to FV version of the code (not boot remapped alias)\r
   ldr   r3, StartupAddr\r
-  \r
+\r
   // Jump to PrePeiCore C code\r
   //    r0 = mp_id\r
   //    r1 = pei_core_address\r