From 21de944e0355f706fbbfc8c612b103a3b55dc3cb Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Fri, 28 Sep 2012 10:52:16 +0000 Subject: [PATCH] ARM Packages: Moved ARM assembly files to 'Arm' subdirectory Signed-off-by: Olivier Martin git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13772 6f19259b-4bc3-4df7-8a09-765794883524 --- .../CpuDxe/{ => ArmV4}/ExceptionSupport.S | 0 .../CpuDxe/{ => ArmV4}/ExceptionSupport.asm | 0 .../ExceptionSupport.S} | 0 .../ExceptionSupport.asm} | 4 +--- ArmPkg/Drivers/CpuDxe/CpuDxe.inf | 18 ++++++++++-------- ArmPkg/Filesystem/SemihostFs/SemihostFs.inf | 1 - .../BaseMemoryLibStm/BaseMemoryLibStm.inf | 4 +++- .../ArmVExpressLibRTSM/{ => Arm}/RTSMHelper.S | 0 .../{ => Arm}/RTSMHelper.asm | 0 .../ArmVExpressLibRTSM/ArmVExpressLib.inf | 8 +++++--- .../ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 6 ++++-- .../ArmVExpressSecLibRTSM/{ => Arm}/RTSMBoot.S | 0 .../{ => Arm}/RTSMBoot.asm | 0 .../{ => Arm}/RTSMHelper.S | 0 .../{ => Arm}/RTSMHelper.asm | 0 .../ArmVExpressSecLib.inf | 10 ++++++---- .../ArmPlatformLibNullSec.inf | 2 ++ .../{ => Arm}/MonitorTable.S | 0 .../{ => Arm}/MonitorTable.asm | 0 .../ArmTrustedMonitorLibNull.inf | 10 ++++++---- 20 files changed, 37 insertions(+), 26 deletions(-) rename ArmPkg/Drivers/CpuDxe/{ => ArmV4}/ExceptionSupport.S (100%) rename ArmPkg/Drivers/CpuDxe/{ => ArmV4}/ExceptionSupport.asm (100%) rename ArmPkg/Drivers/CpuDxe/{ExceptionSupport.ARMv6.S => ArmV6/ExceptionSupport.S} (100%) rename ArmPkg/Drivers/CpuDxe/{ExceptionSupport.ARMv6.asm => ArmV6/ExceptionSupport.asm} (96%) rename ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/{ => Arm}/RTSMHelper.S (100%) rename ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/{ => Arm}/RTSMHelper.asm (100%) rename ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/{ => Arm}/RTSMBoot.S (100%) rename ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/{ => Arm}/RTSMBoot.asm (100%) rename ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/{ => Arm}/RTSMHelper.S (100%) rename ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/{ => Arm}/RTSMHelper.asm (100%) rename ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/{ => Arm}/MonitorTable.S (100%) rename ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/{ => Arm}/MonitorTable.asm (100%) diff --git a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.S b/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.S similarity index 100% rename from ArmPkg/Drivers/CpuDxe/ExceptionSupport.S rename to ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.S diff --git a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.asm b/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.asm similarity index 100% rename from ArmPkg/Drivers/CpuDxe/ExceptionSupport.asm rename to ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.asm diff --git a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S b/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S similarity index 100% rename from ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S rename to ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S diff --git a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.asm b/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.asm similarity index 96% rename from ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.asm rename to ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.asm index 736d479bfc..c3f494ae37 100644 --- a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.asm +++ b/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 diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf index 9a3b8e8afc..b471e4ac2f 100644 --- a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf +++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf @@ -3,7 +3,7 @@ # DXE CPU driver # # Copyright (c) 2009, Apple Inc. All rights reserved.
-# 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] diff --git a/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf b/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf index ca9d489756..25b7289483 100644 --- a/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf +++ b/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf @@ -21,7 +21,6 @@ ENTRY_POINT = SemihostFsEntryPoint - [Sources.ARM] Arm/SemihostFs.c diff --git a/ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf b/ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf index 9a7b18b25b..7d82b12ab2 100755 --- a/ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf +++ b/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 diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMHelper.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S similarity index 100% rename from ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMHelper.S rename to ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMHelper.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm similarity index 100% rename from ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMHelper.asm rename to ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf index e098c75bd0..d4c1093bab 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf +++ b/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 diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf index 4938b939a2..53252b1d05 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf +++ b/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 diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMBoot.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/RTSMBoot.S similarity index 100% rename from ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMBoot.S rename to ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/RTSMBoot.S diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMBoot.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/RTSMBoot.asm similarity index 100% rename from ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMBoot.asm rename to ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/RTSMBoot.asm diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMHelper.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/RTSMHelper.S similarity index 100% rename from ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMHelper.S rename to ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/RTSMHelper.S diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMHelper.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/RTSMHelper.asm similarity index 100% rename from ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMHelper.asm rename to ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/RTSMHelper.asm diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf index e2f9191714..4a1e056af0 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf +++ b/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 diff --git a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf index 46c803d20f..ba55ed5199 100644 --- a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf +++ b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.inf @@ -31,6 +31,8 @@ [Sources.common] ArmPlatformLibNullSec.c + +[Sources.ARM] ArmPlatformLibNullBoot.asm | RVCT ArmPlatformLibNullBoot.S | GCC diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.S b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.S similarity index 100% rename from ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.S rename to ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.S diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.asm b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.asm similarity index 100% rename from ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.asm rename to ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.asm diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.inf b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.inf index 39bd97c6f5..2a9c54babe 100644 --- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.inf +++ b/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 - \ No newline at end of file + -- 2.39.2