From 1d36ec02a55c7bab7b5738e146c8607177ca808b Mon Sep 17 00:00:00 2001
From: oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 28 Jul 2011 14:58:52 +0000
Subject: ArmPkg: Fix ARM builds for XCode32

- Build BeagleBoardPkg, ArmRealViewEb-A8, ArmRealView-A9x2 and ArmVExpress-CTA9x4




git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12055 6f19259b-4bc3-4df7-8a09-765794883524
---
 ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc           | 1 -
 ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc         | 1 -
 ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc                | 1 +
 .../ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.S        | 6 +++---
 ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S                    | 2 --
 ArmPlatformPkg/Sec/SecEntryPoint.S                                  | 4 ++--
 6 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'ArmPlatformPkg')

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
index 152a5ef9d1..a82e13f4a9 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
@@ -237,7 +237,6 @@
 
   XCODE:*_*_ARM_ARCHCC_FLAGS     == -arch armv7 -march=armv7 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform
   XCODE:*_*_ARM_ARCHASM_FLAGS    == -arch armv7 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform
-  XCODE:*_*_ARM_ARCHDLINK_FLAGS  == -arch armv7 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform
   XCODE:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform
 
 
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index a69f8386c7..602bf83791 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -240,7 +240,6 @@
 
   XCODE:*_*_ARM_ARCHCC_FLAGS     == -arch armv7 -march=armv7 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform
   XCODE:*_*_ARM_ARCHASM_FLAGS    == -arch armv7 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform
-  XCODE:*_*_ARM_ARCHDLINK_FLAGS  == -arch armv7 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform
   XCODE:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform
 
 
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index ed7e3477b3..ed1c616e22 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -250,6 +250,7 @@
   ARMGCC:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
   ARMGCC:*_*_ARM_PLATFORM_FLAGS = -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4
   
+  XCODE:*_*_ARM_PLATFORM_FLAGS = -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4
 
 ################################################################################
 #
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.S
index 49ee83e027..c49c66332f 100755
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.S
@@ -76,8 +76,8 @@ ASM_PFX(ArmPlatformInitializeBootMemory):
   // Initialize PL354 SMC
   //
   LoadConstantToReg (ARM_VE_SMC_CTRL_BASE, r1)
-  ldr   r2, =VersatileExpressSmcConfiguration
-  ldr   r3, =VersatileExpressSmcConfigurationEnd
+  LoadConstantToReg (VersatileExpressSmcConfiguration, r2)
+  LoadConstantToReg (VersatileExpressSmcConfigurationEnd, r3)
   blx   ASM_PFX(PL35xSmcInitialize)
 
   //
@@ -97,7 +97,7 @@ ASM_PFX(ArmPlatformInitializeBootMemory):
   ldr     r0, [r2, #0]
   ldr     r0, = 0x00000000
   str     r0, [r2, #0]
-  ldr     r0, = 0x00900090
+  LoadConstantToReg (0x00900090, r0)
   str     r0, [r2, #0]
 
   // Confirm page mode enabled
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
index d61a15bded..f8c5f65763 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
@@ -67,5 +67,3 @@ _PrepareArguments:
   #    r0 = core_id
   #    r1 = pei_core_address
   blx   r2
-
-.end
diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.S b/ArmPlatformPkg/Sec/SecEntryPoint.S
index 5e6dfe45f6..9a4a66b350 100644
--- a/ArmPlatformPkg/Sec/SecEntryPoint.S
+++ b/ArmPlatformPkg/Sec/SecEntryPoint.S
@@ -87,10 +87,10 @@ _InitMem:
 _SetupStack:
   # Setup Stack for the 4 CPU cores
   #Read Stack Base address from PCD
-  LoadConstantToReg (FixedPcdGet32(PcdCPUCoresSecStackBase) ,r1)
+  LoadConstantToReg (FixedPcdGet32(PcdCPUCoresSecStackBase), r1)
 
   #read Stack size from PCD
-  LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecStackSize) ,r2)
+  LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecStackSize), r2)
 
   #calcuate Stack Pointer reg value using Stack size and CPU ID.
   mov     r3,r5         @ r3 = core_id
-- 
cgit v1.2.3