ArmVirtPkg: clean up assembly source files

[mirror_edk2.git] / ArmVirtPkg / Library / ArmVirtPlatformLib / ARM / VirtHelper.asm

diff --git a/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.asm b/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.asm
index 7882e63217fcc54b99ddf96cfe8897482d3f8e24..b476516f21154fb5e5272c87e572004d2db4a1e6 100644 (file)
--- a/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.asm
+++ b/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.asm
@@ -11,10 +11,7 @@
 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 \r
-#include <AsmMacroIoLib.h>\r
-#include <Base.h>\r
 #include <Library/ArmLib.h>\r
-#include <Library/PcdLib.h>\r
 #include <AutoGen.h>\r
 \r
   INCLUDE AsmMacroIoLib.inc\r
@@ -25,10 +22,6 @@
   EXPORT  ArmPlatformGetCorePosition\r
   EXPORT  ArmGetPhysAddrTop\r
 \r
-  IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCore\r
-  IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCoreMask\r
-  IMPORT  _gPcd_FixedAtBuild_PcdCoreCount\r
-\r
   AREA VirtHelper, CODE, READONLY\r
 \r
 ArmPlatformPeiBootAction FUNCTION\r
@@ -40,8 +33,7 @@ ArmPlatformPeiBootAction 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