//\r
-// Copyright (c) 2012, ARM Limited. All rights reserved.\r
+// Copyright (c) 2012-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
#include <AsmMacroIoLib.h>\r
#include <Library/ArmLib.h>\r
\r
-.text \r
-.align 3\r
+.text\r
+.align 2\r
\r
+GCC_ASM_EXPORT(ArmPlatformPeiBootAction)\r
GCC_ASM_EXPORT(ArmPlatformGetCorePosition)\r
GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)\r
GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)\r
GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCore)\r
GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask)\r
\r
+ASM_PFX(ArmPlatformPeiBootAction):\r
+ bx lr\r
+\r
//UINTN\r
//ArmPlatformGetCorePosition (\r
// IN UINTN MpId\r
// );\r
ASM_PFX(ArmPlatformGetCorePosition):\r
- and r1, r0, #ARM_CORE_MASK\r
- and r0, r0, #ARM_CLUSTER_MASK\r
- add r0, r1, r0, LSR #7\r
- bx lr\r
+ and r1, r0, #ARM_CORE_MASK\r
+ and r0, r0, #ARM_CLUSTER_MASK\r
+ add r0, r1, r0, LSR #7\r
+ bx lr\r
\r
//UINTN\r
//ArmPlatformGetPrimaryCoreMpId (\r
// VOID\r
// );\r
ASM_PFX(ArmPlatformGetPrimaryCoreMpId):\r
- LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r0)\r
+ LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r0)\r
ldr r0, [r0]\r
bx lr\r
\r