diff options
Diffstat (limited to 'ArmPkg')
-rw-r--r-- | ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.S (renamed from ArmPkg/Drivers/CpuDxe/ExceptionSupport.S) | 0 | ||||
-rw-r--r-- | ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.asm (renamed from ArmPkg/Drivers/CpuDxe/ExceptionSupport.asm) | 0 | ||||
-rw-r--r-- | ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S (renamed from ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S) | 0 | ||||
-rw-r--r-- | ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.asm (renamed from ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.asm) | 4 | ||||
-rw-r--r-- | ArmPkg/Drivers/CpuDxe/CpuDxe.inf | 18 | ||||
-rw-r--r-- | ArmPkg/Filesystem/SemihostFs/SemihostFs.inf | 1 | ||||
-rwxr-xr-x | ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf | 4 |
7 files changed, 14 insertions, 13 deletions
diff --git a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.S b/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.S index 96bd68246f..96bd68246f 100644 --- a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.S +++ b/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.S diff --git a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.asm b/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.asm index 4af58339b7..4af58339b7 100644 --- a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.asm +++ b/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.asm diff --git a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S b/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S index 86d2a7135f..86d2a7135f 100644 --- a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S +++ b/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S diff --git a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.asm b/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.<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]
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
|