ArmVirt/PrePi: make jump to CEntryPoint relative

[mirror_edk2.git] / ArmVirtPkg / PrePi / AArch64 / ModuleEntryPoint.S

diff --git a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
index d6be3454183411e2d0ad4c92ea79e659412c5915..1fed84ed0ac376b438a0fe73c3fa0f25e4a59e11 100644 (file)
--- a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
+++ b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
@@ -27,7 +27,6 @@ GCC_ASM_IMPORT(ArmPlatformStackSet)
 GCC_ASM_EXPORT(_ModuleEntryPoint)\r
 ASM_GLOBAL ASM_PFX(mSystemMemoryEnd)\r
 \r
-StartupAddr:                  .8byte ASM_PFX(CEntryPoint)\r
 ASM_PFX(mSystemMemoryEnd):    .8byte 0\r
 \r
 ASM_PFX(_ModuleEntryPoint):\r
@@ -163,15 +162,11 @@ _PrepareArguments:
   mov   x1, x21\r
   mov   x2, x22\r
 \r
-  // 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   x4, StartupAddr\r
-\r
   // Jump to PrePiCore C code\r
   //    x0 = MpId\r
   //    x1 = UefiMemoryBase\r
   //    x2 = StacksBase\r
-  blr   x4\r
+  bl    ASM_PFX(CEntryPoint)\r
 \r
 _NeverReturn:\r
   b _NeverReturn\r