Fix minor Xcode build issues.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11348 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 42 insertions, 42 deletions

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
index 79675aeb39..ca18aa88dd 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
@@ -24,39 +24,39 @@
 GCC_ASM_EXPORT(ArmPlatformIsMemoryInitialized)

 GCC_ASM_EXPORT(ArmPlatformInitializeBootMemory)

 

-/**
-  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
-  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.
-  Its implementation must probably done in assembly to ensure this requirement.
-
-  @return   Return the condition value into the 'Z' flag
-
-**/
+/**

+  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

+  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.

+  Its implementation must probably done in assembly to ensure this requirement.

+

+  @return   Return the condition value into the 'Z' flag

+

+**/

 ASM_PFX(ArmPlatformIsMemoryInitialized):

-  // Check if the memory has been already mapped, if so skipped the memory initialization
-  LoadConstantToReg (ARM_EB_SYSCTRL, r0)
-  ldr   r0, [r0, #0]
-  
-  // 0x200 (BIT9): This read-only bit returns the remap status.
-  and   r0, r0, #0x200
-  tst   r0, #0x200
+  // Check if the memory has been already mapped, if so skipped the memory initialization

+  LoadConstantToReg (ARM_EB_SYSCTRL, r0)

+  ldr   r0, [r0, #0]

+  

+  // 0x200 (BIT9): This read-only bit returns the remap status.

+  and   r0, r0, #0x200

+  tst   r0, #0x200

   bx	lr

     

-/**
-  Initialize the memory where the initial stacks will reside
-
-  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
-  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
-  pointer is not used (probably required to use assembly language)
-
-**/
+/**

+  Initialize the memory where the initial stacks will reside

+

+  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

+  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

+  pointer is not used (probably required to use assembly language)

+

+**/

 ASM_PFX(ArmPlatformInitializeBootMemory):

   // The SMC does not need to be initialized for RTSM

   bx    lr

 

-.end

+ASM_FUNCTION_REMOVE_IF_UNREFERENCED
\ No newline at end of file
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
index 759de3a2dd..f633f59462 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
@@ -16,6 +16,7 @@
 #include <Library/DebugLib.h>

 #include <Library/PcdLib.h>

 #include <Library/MemoryAllocationLib.h>

+#include <Library/IoLib.h>

 

 // DDR attributes

 #define DDR_ATTRIBUTES_CACHED           ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK

@@ -54,7 +55,6 @@ VOID ArmPlatformGetPeiMemory (
 

 **/

 VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemoryMap) {

-    UINT32                        val32;

     UINT32                        CacheAttributes;

     BOOLEAN                       bTrustzoneSupport = FALSE;

     UINTN                         Index = 0;

diff --git a/ArmPlatformPkg/Sec/Exception.S b/ArmPlatformPkg/Sec/Exception.S
index 81e2659c1b..54d6104b81 100644
--- a/ArmPlatformPkg/Sec/Exception.S
+++ b/ArmPlatformPkg/Sec/Exception.S
@@ -17,21 +17,21 @@
 
 #start of the code section
 .text
-.align 5

-

+.align 5
+
 # IMPORT
 GCC_ASM_IMPORT(SecCommonExceptionEntry)
 
 # EXPORT
 GCC_ASM_EXPORT(SecVectorTable)
-

+
 //============================================================
 //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.
-Dummy1: .word      0

-Dummy2: .word      0

+Dummy1: .word      0
+Dummy2: .word      0
   
 ASM_PFX(SecVectorTable):
   b _DefaultResetHandler
@@ -102,5 +102,5 @@ _DefaultFiq:
   cps  #0x13
   mov  r0, #7
   blx  SecCommonExceptionEntry
-

-.end

+
+
diff --git a/ArmPlatformPkg/Sec/Helper.S b/ArmPlatformPkg/Sec/Helper.S
index 94bd68f8bc..da3b0e033b 100644
--- a/ArmPlatformPkg/Sec/Helper.S
+++ b/ArmPlatformPkg/Sec/Helper.S
@@ -69,6 +69,6 @@ ASM_PFX(copy_cpsr_into_spsr):
     bx      lr

 

 dead:

-    B       dead

+    b       dead

     

-.end

+ASM_FUNCTION_REMOVE_IF_UNREFERENCED

diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.S b/ArmPlatformPkg/Sec/SecEntryPoint.S
index e7d7160b87..5e6dfe45f6 100644
--- a/ArmPlatformPkg/Sec/SecEntryPoint.S
+++ b/ArmPlatformPkg/Sec/SecEntryPoint.S
@@ -41,8 +41,8 @@ GCC_ASM_IMPORT(SecVectorTable)
 GCC_ASM_IMPORT(ArmIsScuEnable)
 #endif
 
-StartupAddr: .word    		CEntryPoint
-SecVectorTableAddr: .word		SecVectorTable
+StartupAddr:        .word   ASM_PFX(CEntryPoint)
+SecVectorTableAddr: .word		ASM_PFX(SecVectorTable)
 
 ASM_PFX(_ModuleEntryPoint):
  #Set VBAR to the start of the exception vectors in Secure Mode
@@ -109,4 +109,4 @@ _SetupStack:
   #    r0 = core_id
   blx  r3
 
-.end
+