diff options
| author | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-10-04 13:58:28 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-10-04 13:58:28 +0000 |
| commit | 89bbce116a4dabb83c1be5953b030928f2d2f378 (patch) | |
| tree | e1a657c8e42c1856374cc1f16f2d09397b219348 /ArmPkg/Drivers/ArmCpuLib | |
| parent | 41b152c5f6ec3a5a6e51b4f8f0f90291a5895edc (diff) | |
| download | edk2-platforms-89bbce116a4dabb83c1be5953b030928f2d2f378.tar.xz | |
Arm Packages: Fix builds for XCODE32 toolchain
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12509 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPkg/Drivers/ArmCpuLib')
3 files changed, 7 insertions, 7 deletions
diff --git a/ArmPkg/Drivers/ArmCpuLib/Arm11MpCoreLib/Arm11Helper.S b/ArmPkg/Drivers/ArmCpuLib/Arm11MpCoreLib/Arm11Helper.S index 96acde19e8..ad28d10ce2 100644 --- a/ArmPkg/Drivers/ArmCpuLib/Arm11MpCoreLib/Arm11Helper.S +++ b/ArmPkg/Drivers/ArmCpuLib/Arm11MpCoreLib/Arm11Helper.S @@ -27,7 +27,7 @@ ASM_PFX(ArmCpuSynchronizeWait): cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT
// The SCU enabled is the event to tell us the Init Boot Memory is initialized
bx lr
- b CArmCpuSynchronizeWait
+ b ASM_PFX(CArmCpuSynchronizeWait)
#if 0
@@ -43,7 +43,7 @@ ASM_PFX(ArmCpuSynchronizeWait): cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT
// The SCU enabled is the event to tell us the Init Boot Memory is initialized
beq ArmWaitScuEnabled
- b CArmCpuSynchronizeWait
+ b ASM_PFX(CArmCpuSynchronizeWait)
// IN None
// OUT r0 = SCU Base Address
diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.S b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.S index 6b3020a93c..b3e0597ddd 100644 --- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.S +++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.S @@ -34,11 +34,11 @@ ASM_PFX(ArmCpuSynchronizeWait): cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT
// The SCU enabled is the event to tell us the Init Boot Memory is initialized
beq ArmWaitGicDistributorEnabled
- b CArmCpuSynchronizeWait
+ bx ASM_PFX(CArmCpuSynchronizeWait)
// IN None
ArmWaitGicDistributorEnabled:
- LoadConstantToReg (_gPcd_FixedAtBuild_PcdGicDistributorBase, r0)
+ LoadConstantToReg (ASM_PFX(_gPcd_FixedAtBuild_PcdGicDistributorBase), r0)
ldr r0, [r0]
_WaitGicDistributor:
ldr r1, [r0, #ARM_GIC_ICDDCR]
diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S index 0d6a62b740..a66e8e7856 100644 --- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S +++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S @@ -28,8 +28,8 @@ GCC_ASM_IMPORT(CArmCpuSynchronizeWait) ASM_PFX(ArmCpuSynchronizeWait):
cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT
// The SCU enabled is the event to tell us the Init Boot Memory is initialized
- beq ArmWaitScuEnabled
- b CArmCpuSynchronizeWait
+ beq ASM_PFX(ArmWaitScuEnabled)
+ b ASM_PFX(CArmCpuSynchronizeWait)
// IN None
// OUT r0 = SCU Base Address
@@ -48,5 +48,5 @@ ASM_PFX(ArmWaitScuEnabled): add r0, r0, #A9_SCU_CONTROL_OFFSET
ldr r0, [r0]
cmp r0, #1
- bne ArmWaitScuEnabled
+ bne ASM_PFX(ArmWaitScuEnabled)
bx lr
|