diff options
| author | Steven Kinney <steven.kinney@amd.com> | 2014-04-17 13:42:47 -0500 |
|---|---|---|
| committer | Steven Kinney <steven.kinney@amd.com> | 2014-04-17 13:42:47 -0500 |
| commit | 5261f4659a94e49046d26c6d6d2b2f75d7aca289 (patch) | |
| tree | c85e326534133066ae301b48525d034a4735b2a6 /ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf | |
| parent | 4533f02a98912c745b036d8e6e836e942f244d12 (diff) | |
| parent | 48c8a38e05b73fc8b8eb72dbbdafa02a81b97818 (diff) | |
Fix merge conflicts.linaro-edk2-2014.04
Merge branch 'release-prep'
Conflicts:
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
Signed-off-by: Steven Kinney <steven.kinney@amd.com>
Diffstat (limited to 'ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf')
| -rw-r--r-- | ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf index dca0b22dd..06824e5e7 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf @@ -1,7 +1,7 @@ #/** @file
#
# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
-# Portions copyright (c) 2011-2013, ARM Limited. All rights reserved.
+# Portions copyright (c) 2011 - 2014, 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
@@ -26,10 +26,12 @@ AArch64Mmu.c
AArch64ArchTimer.c
ArmLibSupportV8.S | GCC
- ../Common/AArch64/ArmLibSupport.S | GCC
AArch64Support.S | GCC
AArch64ArchTimerSupport.S | GCC
+ ../Common/AArch64/ArmLibSupport.S | GCC
+ ../Common/ArmLib.c
+
[Packages]
ArmPkg/ArmPkg.dec
MdePkg/MdePkg.dec
|