tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmPkg/ArmCpuLib: Fix GCC/XCode builds 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12626 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
oliviermartin 2011-11-01 23:32:04 +00:00
parent 793275a858
commit 81be6e070f
8 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.S
View File

@ -34,7 +34,11 @@ ASM_PFX(ArmCpuSynchronizeWait):
cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT
// The SCU enabled is the event to tell us the Init Boot Memory is initialized // The SCU enabled is the event to tell us the Init Boot Memory is initialized
beq ArmWaitGicDistributorEnabled beq ArmWaitGicDistributorEnabled
bx ASM_PFX(CArmCpuSynchronizeWait) push {r1,lr}
LoadConstantToReg (ASM_PFX(CArmCpuSynchronizeWait), r1)
blx r1
pop {r1,lr}
bx lr
// IN None // IN None
ArmWaitGicDistributorEnabled: ArmWaitGicDistributorEnabled:

8
ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.asm
View File

@ -35,7 +35,13 @@ ArmCpuSynchronizeWait
cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT
// The SCU enabled is the event to tell us the Init Boot Memory is initialized // The SCU enabled is the event to tell us the Init Boot Memory is initialized
beq ArmWaitGicDistributorEnabled beq ArmWaitGicDistributorEnabled
b CArmCpuSynchronizeWait // Case when the stack has been set up
push {r1,lr}
LoadConstantToReg (CArmCpuSynchronizeWait, r1)
blx r1
pop {r1,lr}
bx lr
// IN None // IN None
ArmWaitGicDistributorEnabled ArmWaitGicDistributorEnabled

8
ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S
View File

@ -11,6 +11,7 @@
// //
// //
#include <AsmMacroIoLib.h>
#include <Library/ArmCpuLib.h> #include <Library/ArmCpuLib.h>
#include <Chipset/ArmCortexA9.h> #include <Chipset/ArmCortexA9.h>
@ -29,7 +30,12 @@ ASM_PFX(ArmCpuSynchronizeWait):
cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT
// The SCU enabled is the event to tell us the Init Boot Memory is initialized // The SCU enabled is the event to tell us the Init Boot Memory is initialized
beq ASM_PFX(ArmWaitScuEnabled) beq ASM_PFX(ArmWaitScuEnabled)
b ASM_PFX(CArmCpuSynchronizeWait) // Case when the stack has been set up
push {r1,lr}
LoadConstantToReg (ASM_PFX(CArmCpuSynchronizeWait), r1)
blx r1
pop {r1,lr}
bx lr
// IN None // IN None
// OUT r0 = SCU Base Address // OUT r0 = SCU Base Address

10
ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.asm
View File

@ -11,9 +11,12 @@
// //
// //
#include <AsmMacroIoLib.h>
#include <Library/ArmCpuLib.h> #include <Library/ArmCpuLib.h>
#include <Chipset/ArmCortexA9.h> #include <Chipset/ArmCortexA9.h>
INCLUDE AsmMacroIoLib.inc
EXPORT ArmCpuSynchronizeWait EXPORT ArmCpuSynchronizeWait
EXPORT ArmGetScuBaseAddress EXPORT ArmGetScuBaseAddress
IMPORT CArmCpuSynchronizeWait IMPORT CArmCpuSynchronizeWait
@ -29,7 +32,12 @@ ArmCpuSynchronizeWait
cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT cmp r0, #ARM_CPU_EVENT_BOOT_MEM_INIT
// The SCU enabled is the event to tell us the Init Boot Memory is initialized // The SCU enabled is the event to tell us the Init Boot Memory is initialized
beq ArmWaitScuEnabled beq ArmWaitScuEnabled
b CArmCpuSynchronizeWait // Case when the stack has been set up
push {r1,lr}
LoadConstantToReg (CArmCpuSynchronizeWait, r1)
blx r1
pop {r1,lr}
bx lr
// IN None // IN None
// OUT r0 = SCU Base Address // OUT r0 = SCU Base Address

1
ArmPkg/Drivers/TimerDxe/TimerDxe.c
View File

@ -16,6 +16,7 @@
#include <PiDxe.h> #include <PiDxe.h>
#include <Library/ArmLib.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>

1
ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.c
View File

@ -22,6 +22,7 @@
**/ **/
#include <Base.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>

3
ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
View File

@ -37,5 +37,4 @@
DebugLib DebugLib
PeCoffGetEntryPointLib PeCoffGetEntryPointLib
ArmDisassemblerLib ArmDisassemblerLib
SerialPortLib

2
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
View File

@ -68,7 +68,7 @@
GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a9 -mfpu=neon -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4 GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a9 -mfpu=neon -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4
XCODE:*_*_ARM_PLATFORM_FLAGS == -march=armv7-a -mfpu=neon -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4 XCODE:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a9 -mfpu=neon -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4
################################################################################ ################################################################################
# #