Fix minor Xcode build issues.

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

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
index 79675aeb39219bc1735210b9e8c64efeef2f3c3a..ca18aa88ddb9706db1ca8a6fd2afd340de41d752 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
@@ -24,39 +24,39 @@
 GCC_ASM_EXPORT(ArmPlatformIsMemoryInitialized)\r
 GCC_ASM_EXPORT(ArmPlatformInitializeBootMemory)\r
 \r
-/**
-  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
-
-**/
+/**\r
+  Called at the early stage of the Boot phase to know if the memory has already been initialized\r
+\r
+  Running the code from the reset vector does not mean we start from cold boot. In some case, we\r
+  can go through this code with the memory already initialized.\r
+  Because this function is called at the early stage, the implementation must not use the stack.\r
+  Its implementation must probably done in assembly to ensure this requirement.\r
+\r
+  @return   Return the condition value into the 'Z' flag\r
+\r
+**/\r
 ASM_PFX(ArmPlatformIsMemoryInitialized):\r
-  // 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\r
+  LoadConstantToReg (ARM_EB_SYSCTRL, r0)\r
+  ldr   r0, [r0, #0]\r
+  \r
+  // 0x200 (BIT9): This read-only bit returns the remap status.\r
+  and   r0, r0, #0x200\r
+  tst   r0, #0x200\r
   bx   lr\r
     \r
-/**
-  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)
-
-**/
+/**\r
+  Initialize the memory where the initial stacks will reside\r
+\r
+  This memory can contain the initial stacks (Secure and Secure Monitor stacks).\r
+  In some platform, this region is already initialized and the implementation of this function can\r
+  do nothing. This memory can also represent the Secure RAM.\r
+  This function is called before the satck has been set up. Its implementation must ensure the stack\r
+  pointer is not used (probably required to use assembly language)\r
+\r
+**/\r
 ASM_PFX(ArmPlatformInitializeBootMemory):\r
   // The SMC does not need to be initialized for RTSM\r
   bx    lr\r
 \r
-.end\r
+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 759de3a2dd7f288a1a64a742b4138fb2a23f524e..f633f59462983e15e52d73812e96a325f92bd653 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
@@ -16,6 +16,7 @@
 #include <Library/DebugLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
+#include <Library/IoLib.h>\r
 \r
 // DDR attributes\r
 #define DDR_ATTRIBUTES_CACHED           ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK\r
@@ -54,7 +55,6 @@ VOID ArmPlatformGetPeiMemory (
 \r
 **/\r
 VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemoryMap) {\r
-    UINT32                        val32;\r
     UINT32                        CacheAttributes;\r
     BOOLEAN                       bTrustzoneSupport = FALSE;\r
     UINTN                         Index = 0;\r

diff --git a/ArmPlatformPkg/Sec/Exception.S b/ArmPlatformPkg/Sec/Exception.S
index 81e2659c1b645917b29e53378a2871c05bd24455..54d6104b8155b2eda930b9ccca748341b5b7196f 100644 (file)
--- a/ArmPlatformPkg/Sec/Exception.S
+++ b/ArmPlatformPkg/Sec/Exception.S
@@ -17,21 +17,21 @@
 
 #start of the code section
 .text
-.align 5\r
-\r
+.align 5
+
 # IMPORT
 GCC_ASM_IMPORT(SecCommonExceptionEntry)
 
 # EXPORT
 GCC_ASM_EXPORT(SecVectorTable)
-\r
+
 //============================================================
 //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\r
-Dummy2: .word      0\r
+Dummy1: .word      0
+Dummy2: .word      0
   
 ASM_PFX(SecVectorTable):
   b _DefaultResetHandler
@@ -102,5 +102,5 @@ _DefaultFiq:
   cps  #0x13
   mov  r0, #7
   blx  SecCommonExceptionEntry
-\r
-.end\r
+
+

diff --git a/ArmPlatformPkg/Sec/Helper.S b/ArmPlatformPkg/Sec/Helper.S
index 94bd68f8bc010446d5129571a77619cd8a5e28f5..da3b0e033b53140c209b1f92e874912c7a5ea256 100644 (file)
--- a/ArmPlatformPkg/Sec/Helper.S
+++ b/ArmPlatformPkg/Sec/Helper.S
@@ -69,6 +69,6 @@ ASM_PFX(copy_cpsr_into_spsr):
     bx      lr\r
 \r
 dead:\r
-    B       dead\r
+    b       dead\r
     \r
-.end\r
+ASM_FUNCTION_REMOVE_IF_UNREFERENCED\r

diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.S b/ArmPlatformPkg/Sec/SecEntryPoint.S
index e7d7160b87cefdfb0a4c4d94b19bd1611b36f02a..5e6dfe45f6ec60477cdbfae9bacbbfb1d2bdfaf9 100644 (file)
--- 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
+