ArmVirt/PrePi: make jump to CEntryPoint relative

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

diff --git a/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S b/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S
index 3215c7d55876bc9478a9d9c0156c967cb051b67a..a0176af91c8f02882f88d963accaf64e1f1d458f 100644 (file)
--- a/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S
+++ b/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S
@@ -27,7 +27,6 @@ GCC_ASM_IMPORT(ArmPlatformStackSet)
 GCC_ASM_EXPORT(_ModuleEntryPoint)\r
 ASM_GLOBAL ASM_PFX(mSystemMemoryEnd)\r
 \r
-StartupAddr:                  .long ASM_PFX(CEntryPoint)\r
 ASM_PFX(mSystemMemoryEnd):    .quad 0\r
 \r
 __relocs:\r
@@ -182,15 +181,11 @@ _PrepareArguments:
   mov   r1, r11\r
   mov   r2, r9\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   r4, StartupAddr\r
-\r
   // Jump to PrePiCore C code\r
   //    r0 = MpId\r
   //    r1 = UefiMemoryBase\r
   //    r2 = StacksBase\r
-  blx   r4\r
+  bl    ASM_PFX(CEntryPoint)\r
 \r
 _NeverReturn:\r
   b _NeverReturn\r