ArmPlatformPkg RVCT: drop dependency on GCC macro library

[mirror_edk2.git] / ArmPlatformPkg / Library / ArmPlatformLibNull / Arm / ArmPlatformHelper.asm

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
index 95704c100a7ad4ab5fc4bc8dcf4fdfd1c21b8b40..c0f9a60dc836ff58c69732017b77770503fc6a25 100644 (file)
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
@@ -11,7 +11,6 @@
 //\r
 //\r
 \r
-#include <AsmMacroIoLib.h>\r
 #include <Library/ArmLib.h>\r
 \r
   INCLUDE AsmMacroIoLib.inc\r
@@ -47,8 +46,7 @@ ArmPlatformGetCorePosition FUNCTION
 //  VOID\r
 //  );\r
 ArmPlatformGetPrimaryCoreMpId FUNCTION\r
-  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r0)\r
-  ldr   r0, [r0]\r
+  mov32 r0, FixedPcdGet32(PcdArmPrimaryCore)\r
   bx    lr\r
   ENDFUNC\r
 \r
@@ -57,11 +55,9 @@ ArmPlatformGetPrimaryCoreMpId FUNCTION
 //  IN UINTN MpId\r
 //  );\r
 ArmPlatformIsPrimaryCore FUNCTION\r
-  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r1)\r
-  ldr   r1, [r1]\r
+  mov32 r1, FixedPcdGet32(PcdArmPrimaryCoreMask)\r
   and   r0, r0, r1\r
-  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r1)\r
-  ldr   r1, [r1]\r
+  mov32 r1, FixedPcdGet32(PcdArmPrimaryCore)\r
   cmp   r0, r1\r
   moveq r0, #1\r
   movne r0, #0\r