Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix minor Xcode build issues. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11348 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
andrewfish 2011-03-05 13:23:47 +00:00
parent 6ced2e11d0
commit 6377d2f12d
5 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
View File

@ -24,39 +24,39 @@
GCC_ASM_EXPORT(ArmPlatformIsMemoryInitialized) GCC_ASM_EXPORT(ArmPlatformIsMemoryInitialized)
GCC_ASM_EXPORT(ArmPlatformInitializeBootMemory) GCC_ASM_EXPORT(ArmPlatformInitializeBootMemory)
/** /**
Called at the early stage of the Boot phase to know if the memory has already been initialized Called at the early stage of the Boot phase to know if the memory has already been initialized
Running the code from the reset vector does not mean we start from cold boot. In some case, we Running the code from the reset vector does not mean we start from cold boot. In some case, we
can go through this code with the memory already initialized. can go through this code with the memory already initialized.
Because this function is called at the early stage, the implementation must not use the stack. Because this function is called at the early stage, the implementation must not use the stack.
Its implementation must probably done in assembly to ensure this requirement. Its implementation must probably done in assembly to ensure this requirement.
@return Return the condition value into the 'Z' flag @return Return the condition value into the 'Z' flag
**/ **/
ASM_PFX(ArmPlatformIsMemoryInitialized): ASM_PFX(ArmPlatformIsMemoryInitialized):
// Check if the memory has been already mapped, if so skipped the memory initialization // Check if the memory has been already mapped, if so skipped the memory initialization
LoadConstantToReg (ARM_EB_SYSCTRL, r0) LoadConstantToReg (ARM_EB_SYSCTRL, r0)
ldr r0, [r0, #0] ldr r0, [r0, #0]
// 0x200 (BIT9): This read-only bit returns the remap status. // 0x200 (BIT9): This read-only bit returns the remap status.
and r0, r0, #0x200 and r0, r0, #0x200
tst r0, #0x200 tst r0, #0x200
bx lr bx lr
/** /**
Initialize the memory where the initial stacks will reside Initialize the memory where the initial stacks will reside
This memory can contain the initial stacks (Secure and Secure Monitor stacks). This memory can contain the initial stacks (Secure and Secure Monitor stacks).
In some platform, this region is already initialized and the implementation of this function can In some platform, this region is already initialized and the implementation of this function can
do nothing. This memory can also represent the Secure RAM. do nothing. This memory can also represent the Secure RAM.
This function is called before the satck has been set up. Its implementation must ensure the stack This function is called before the satck has been set up. Its implementation must ensure the stack
pointer is not used (probably required to use assembly language) pointer is not used (probably required to use assembly language)
**/ **/
ASM_PFX(ArmPlatformInitializeBootMemory): ASM_PFX(ArmPlatformInitializeBootMemory):
// The SMC does not need to be initialized for RTSM // The SMC does not need to be initialized for RTSM
bx lr bx lr
.end ASM_FUNCTION_REMOVE_IF_UNREFERENCED

2
ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
View File

@ -16,6 +16,7 @@
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/PcdLib.h> #include <Library/PcdLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include <Library/IoLib.h>
// DDR attributes // DDR attributes
#define DDR_ATTRIBUTES_CACHED ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK #define DDR_ATTRIBUTES_CACHED ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK
@ -54,7 +55,6 @@ VOID ArmPlatformGetPeiMemory (
**/ **/
VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemoryMap) { VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemoryMap) {
UINT32 val32;
UINT32 CacheAttributes; UINT32 CacheAttributes;
BOOLEAN bTrustzoneSupport = FALSE; BOOLEAN bTrustzoneSupport = FALSE;
UINTN Index = 0; UINTN Index = 0;

14
ArmPlatformPkg/Sec/Exception.S
View File

@ -17,21 +17,21 @@
#start of the code section #start of the code section
.text .text
.align 5 .align 5
# IMPORT # IMPORT
GCC_ASM_IMPORT(SecCommonExceptionEntry) GCC_ASM_IMPORT(SecCommonExceptionEntry)
# EXPORT # EXPORT
GCC_ASM_EXPORT(SecVectorTable) GCC_ASM_EXPORT(SecVectorTable)
//============================================================ //============================================================
//Default Exception Handlers //Default Exception Handlers
//============================================================ //============================================================
//FIXME: One of the EDK2 tool is broken. It does not look to respect the alignment. Even, if we specify 32-byte alignment for this file. //FIXME: One of the EDK2 tool is broken. It does not look to respect the alignment. Even, if we specify 32-byte alignment for this file.
Dummy1: .word 0 Dummy1: .word 0
Dummy2: .word 0 Dummy2: .word 0
ASM_PFX(SecVectorTable): ASM_PFX(SecVectorTable):
b _DefaultResetHandler b _DefaultResetHandler
@ -102,5 +102,5 @@ _DefaultFiq:
cps #0x13 cps #0x13
mov r0, #7 mov r0, #7
blx SecCommonExceptionEntry blx SecCommonExceptionEntry
.end

4
ArmPlatformPkg/Sec/Helper.S
View File

@ -69,6 +69,6 @@ ASM_PFX(copy_cpsr_into_spsr):
bx lr bx lr
dead: dead:
B dead b dead
.end ASM_FUNCTION_REMOVE_IF_UNREFERENCED

6
ArmPlatformPkg/Sec/SecEntryPoint.S
View File

@ -41,8 +41,8 @@ GCC_ASM_IMPORT(SecVectorTable)
GCC_ASM_IMPORT(ArmIsScuEnable) GCC_ASM_IMPORT(ArmIsScuEnable)
#endif #endif
StartupAddr: .word CEntryPoint StartupAddr: .word ASM_PFX(CEntryPoint)
SecVectorTableAddr: .word SecVectorTable SecVectorTableAddr: .word ASM_PFX(SecVectorTable)
ASM_PFX(_ModuleEntryPoint): ASM_PFX(_ModuleEntryPoint):
#Set VBAR to the start of the exception vectors in Secure Mode #Set VBAR to the start of the exception vectors in Secure Mode
@ -109,4 +109,4 @@ _SetupStack:
# r0 = core_id # r0 = core_id
blx r3 blx r3
.end