ARM Packages: Moved ARM assembly files to 'Arm' subdirectory

Signed-off-by: Olivier Martin <olivier.martin@arm.com>



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

ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.asm

@@ -59,9 +59,7 @@ This is the stack constructed by the exception handler (low address to high addr
   IMPORT  CommonCExceptionHandler
 
   PRESERVE8
-  AREA  DxeExceptionHandlers, CODE, READONLY
-  
-  ALIGN   32
+  AREA  DxeExceptionHandlers, CODE, READONLY, CODEALIGN, ALIGN=5
   
 //
 // This code gets copied to the ARM vector table

ArmPkg/Drivers/CpuDxe/CpuDxe.inf

@@ -3,7 +3,7 @@
 #  DXE CPU driver
 #  
 #  Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
-#  Copyright (c) 2011, ARM Limited. All rights reserved.
+#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -24,24 +24,26 @@
 
   ENTRY_POINT                    = CpuDxeInitialize
 
-[Sources.ARM]
+[Sources.Common]
   CpuDxe.c
   CpuDxe.h
   CpuMpCore.c
-  Exception.c
 
 #
 # Prior to ARMv6 we have multiple stacks, one per mode
 #
-#  ExceptionSupport.asm | RVCT
-#  ExceptionSupport.S   | GCC
+#  ArmV4/ExceptionSupport.asm | RVCT
+#  ArmV4/ExceptionSupport.S   | GCC
 
 #
 # ARMv6 or later uses a single stack via srs/stm instructions
 #
-  ExceptionSupport.ARMv6.asm | RVCT
-  ExceptionSupport.ARMv6.S   | GCC
-  Mmu.c  
+
+[Sources.ARM]
+  Mmu.c
+  Exception.c
+  ArmV6/ExceptionSupport.asm | RVCT
+  ArmV6/ExceptionSupport.S   | GCC
 
 
 [Packages]

ArmPkg/Filesystem/SemihostFs/SemihostFs.inf

@@ -21,7 +21,6 @@
 
   ENTRY_POINT                    = SemihostFsEntryPoint
 
-
 [Sources.ARM]
   Arm/SemihostFs.c
   

ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf

@@ -32,7 +32,7 @@
 #
 
 
-[Sources.ARM]
+[Sources.Common]
   ScanMem64Wrapper.c
   ScanMem32Wrapper.c
   ScanMem16Wrapper.c
@@ -47,6 +47,8 @@
   MemLibGeneric.c
   MemLibGuid.c  
   MemLibInternals.h
+
+[Sources.ARM]
   Arm/CopyMem.asm
   Arm/CopyMem.S
   Arm/SetMem.asm

ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf

@@ -34,9 +34,11 @@
 
 [Sources.common]
   RTSM.c
-  RTSMMem.c  
-  RTSMHelper.asm    | RVCT
-  RTSMHelper.S      | GCC
+  RTSMMem.c
+
+[Sources.ARM]
+  Arm/RTSMHelper.asm    | RVCT
+  Arm/RTSMHelper.S      | GCC
 
 [FeaturePcd]
   gEmbeddedTokenSpaceGuid.PcdCacheEnable

ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf

@@ -33,8 +33,10 @@
 
 [Sources.common]
   RTSM.c
-  RTSMHelper.asm    | RVCT
-  RTSMHelper.S      | GCC
+
+[Sources.ARM]
+  Arm/RTSMHelper.asm    | RVCT
+  Arm/RTSMHelper.S      | GCC
 
 [FeaturePcd]
   gEmbeddedTokenSpaceGuid.PcdCacheEnable

ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf

@@ -33,10 +33,12 @@
 
 [Sources.common]
   RTSMSec.c
-  RTSMBoot.asm     | RVCT
-  RTSMBoot.S       | GCC
-  RTSMHelper.asm   | RVCT
-  RTSMHelper.S     | GCC
+
+[Sources.ARM]
+  Arm/RTSMBoot.asm     | RVCT
+  Arm/RTSMBoot.S       | GCC
+  Arm/RTSMHelper.asm   | RVCT
+  Arm/RTSMHelper.S     | GCC
 
 [FeaturePcd]
   gEmbeddedTokenSpaceGuid.PcdCacheEnable

ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf

@@ -31,6 +31,8 @@
 
 [Sources.common]
   ArmPlatformLibNullSec.c
+
+[Sources.ARM]
   ArmPlatformLibNullBoot.asm     | RVCT
   ArmPlatformLibNullBoot.S       | GCC
 

ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.inf

@@ -1,5 +1,5 @@
 #/* @file
-#  Copyright (c) 2011, ARM Limited. All rights reserved.
+#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
 #  
 #  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
@@ -21,8 +21,10 @@
 
 [Sources.common]
   ArmTrustedMonitorLibNull.c
-  MonitorTable.asm     | RVCT
-  MonitorTable.S       | GCC
+
+[Sources.ARM]
+  Arm/MonitorTable.asm     | RVCT
+  Arm/MonitorTable.S       | GCC
 
 [Packages]
   ArmPkg/ArmPkg.dec
@@ -34,4 +36,4 @@
   BaseLib
   DebugLib
   PcdLib
-  
+