From 7668305cf438ca5e2b9d49d835b2c150590adf79 Mon Sep 17 00:00:00 2001 From: andrewfish Date: Fri, 2 Jul 2010 13:28:04 +0000 Subject: [PATCH] Use same scheme as *.asm file. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10623 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmRealViewEbPkg/SecForPei/Arm/ModuleEntryPoint.S | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ArmRealViewEbPkg/SecForPei/Arm/ModuleEntryPoint.S b/ArmRealViewEbPkg/SecForPei/Arm/ModuleEntryPoint.S index 385dd334bb..57fea68c65 100755 --- a/ArmRealViewEbPkg/SecForPei/Arm/ModuleEntryPoint.S +++ b/ArmRealViewEbPkg/SecForPei/Arm/ModuleEntryPoint.S @@ -31,8 +31,7 @@ .globl ASM_PFX(StartupAddr) -ASM_PFX(CEntryPointData): - .word ASM_PFX(StartupAddr) +ASM_PFX(StartupAddr): .word ASM_PFX(CEntryPoint) ASM_PFX(_ModuleEntryPoint): @@ -67,8 +66,7 @@ ASM_PFX(_ModuleEntryPoint): // move sec startup address into a data register // ensure we're jumping to FV version of the code (not boot remapped alias) - ldr r5, ASM_PFX(CEntryPointData) // Extra level of indirection fixes Xcode relocation issue - ldr r4, [r5] + ldr r4, ASM_PFX(StartupAddr) // Extra level of indirection fixes Xcode relocation issue // jump to SEC C code blx r4