From 21de944e0355f706fbbfc8c612b103a3b55dc3cb Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Fri, 28 Sep 2012 10:52:16 +0000 Subject: 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 --- .../ArmTrustedMonitorLibNull/Arm/MonitorTable.S | 41 ++++++++++++++++++++++ .../ArmTrustedMonitorLibNull/Arm/MonitorTable.asm | 40 +++++++++++++++++++++ .../ArmTrustedMonitorLibNull.inf | 10 +++--- .../ArmTrustedMonitorLibNull/MonitorTable.S | 41 ---------------------- .../ArmTrustedMonitorLibNull/MonitorTable.asm | 40 --------------------- 5 files changed, 87 insertions(+), 85 deletions(-) create mode 100644 ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.S create mode 100644 ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.asm delete mode 100644 ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.S delete mode 100644 ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.asm (limited to 'ArmPlatformPkg/Library/ArmTrustedMonitorLibNull') diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.S b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.S new file mode 100644 index 0000000000..3e75bee505 --- /dev/null +++ b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.S @@ -0,0 +1,41 @@ +// +// Copyright (c) 2011, 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 +// which accompanies this distribution. The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// + +#include +#include +#include + +.text +.align 5 + +GCC_ASM_EXPORT(MonitorVectorTable) + +ASM_PFX(MonitorVectorTable): + +_MonitorResetEntry: + b _MonitorResetEntry +_MonitorUndefinedEntry: + b _MonitorUndefinedEntry +_MonitorSmcEntry: + b _MonitorSmcEntry +_MonitorPrefetchEntry: + b _MonitorPrefetchEntry +_MonitorDataAbortEntry: + b _MonitorDataAbortEntry +_MonitorReservedEntry: + b _MonitorReservedEntry +_MonitorIrqEntry: + b _MonitorIrqEntry +_MonitorFiqEntry: + b _MonitorFiqEntry + diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.asm b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.asm new file mode 100644 index 0000000000..f4f515d05c --- /dev/null +++ b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.asm @@ -0,0 +1,40 @@ +// +// Copyright (c) 2011, 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 +// which accompanies this distribution. The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// + +#include + + EXPORT MonitorVectorTable + + PRESERVE8 + AREA MonitoVectorTableArea, CODE, READONLY, CODEALIGN, ALIGN=5 + +MonitorVectorTable + +_MonitorResetEntry + b _MonitorResetEntry +_MonitorUndefinedEntry + b _MonitorUndefinedEntry +_MonitorSmcEntry + b _MonitorSmcEntry +_MonitorPrefetchEntry + b _MonitorPrefetchEntry +_MonitorDataAbortEntry + b _MonitorDataAbortEntry +_MonitorReservedEntry + b _MonitorReservedEntry +_MonitorIrqEntry + b _MonitorIrqEntry +_MonitorFiqEntry + b _MonitorFiqEntry + + END 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 + diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.S b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.S deleted file mode 100644 index 3e75bee505..0000000000 --- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.S +++ /dev/null @@ -1,41 +0,0 @@ -// -// Copyright (c) 2011, 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 -// which accompanies this distribution. The full text of the license may be found at -// http://opensource.org/licenses/bsd-license.php -// -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// -// - -#include -#include -#include - -.text -.align 5 - -GCC_ASM_EXPORT(MonitorVectorTable) - -ASM_PFX(MonitorVectorTable): - -_MonitorResetEntry: - b _MonitorResetEntry -_MonitorUndefinedEntry: - b _MonitorUndefinedEntry -_MonitorSmcEntry: - b _MonitorSmcEntry -_MonitorPrefetchEntry: - b _MonitorPrefetchEntry -_MonitorDataAbortEntry: - b _MonitorDataAbortEntry -_MonitorReservedEntry: - b _MonitorReservedEntry -_MonitorIrqEntry: - b _MonitorIrqEntry -_MonitorFiqEntry: - b _MonitorFiqEntry - diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.asm b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.asm deleted file mode 100644 index f4f515d05c..0000000000 --- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/MonitorTable.asm +++ /dev/null @@ -1,40 +0,0 @@ -// -// Copyright (c) 2011, 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 -// which accompanies this distribution. The full text of the license may be found at -// http://opensource.org/licenses/bsd-license.php -// -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// -// - -#include - - EXPORT MonitorVectorTable - - PRESERVE8 - AREA MonitoVectorTableArea, CODE, READONLY, CODEALIGN, ALIGN=5 - -MonitorVectorTable - -_MonitorResetEntry - b _MonitorResetEntry -_MonitorUndefinedEntry - b _MonitorUndefinedEntry -_MonitorSmcEntry - b _MonitorSmcEntry -_MonitorPrefetchEntry - b _MonitorPrefetchEntry -_MonitorDataAbortEntry - b _MonitorDataAbortEntry -_MonitorReservedEntry - b _MonitorReservedEntry -_MonitorIrqEntry - b _MonitorIrqEntry -_MonitorFiqEntry - b _MonitorFiqEntry - - END -- cgit v1.2.3