ArmPlatformPkg: remove ArmTrustedMonitorLib definition and implementation

Remove ArmTrustedMonitorLib and its only [NULL] implementation.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

6 files changed, 0 insertions, 207 deletions

diff --git a/ArmPlatformPkg/Include/Library/ArmTrustedMonitorLib.h b/ArmPlatformPkg/Include/Library/ArmTrustedMonitorLib.h
deleted file mode 100644
index 5368697c5c..0000000000
--- a/ArmPlatformPkg/Include/Library/ArmTrustedMonitorLib.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/** @file

-*  Main file supporting the Monitor World on ARM PLatforms

-*

-*  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.

-*

-**/

-

-#ifndef __ARM_TRUSTED_MONITOR_LIB_H_

-#define __ARM_TRUSTED_MONITOR_LIB_H_

-

-VOID

-ArmSecureMonitorWorldInitialize (

-  VOID

-  );

-

-#endif

diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/AArch64/ArmTrustedMonitorLibNull.c b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/AArch64/ArmTrustedMonitorLibNull.c
deleted file mode 100644
index 72c62d7f10..0000000000
--- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/AArch64/ArmTrustedMonitorLibNull.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/** @file

-*  Main file supporting the Monitor World on ARM PLatforms

-*

-*  Copyright (c) 2012-2013, 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.

-*

-**/

-

-VOID

-ArmSecureMonitorWorldInitialize (

-  VOID

-  )

-{

-  // Do not touch the EL3 Exception Vector Table Register.

-  // The default default DebugAgentLib could have already set its own vector

-  // into EL3 to catch abort exceptions.

-}

diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/ArmTrustedMonitorLibNull.c b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/ArmTrustedMonitorLibNull.c
deleted file mode 100644
index 1f950d78f1..0000000000
--- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/ArmTrustedMonitorLibNull.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/** @file

-*  Main file supporting the Monitor World on ARM PLatforms

-*

-*  Copyright (c) 2011-2013, 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 <Library/ArmLib.h>

-#include <Library/ArmTrustedMonitorLib.h>

-#include <Library/DebugLib.h>

-

-#define IS_ALIGNED(Address, Align) (((UINTN)Address & (Align-1)) == 0)

-

-VOID

-MonitorVectorTable (

-  VOID

-  );

-

-VOID

-ArmSecureMonitorWorldInitialize (

-  VOID

-  )

-{

-  // Ensure the Monitor Table is 32bit aligned

-  ASSERT (((UINTN)&MonitorVectorTable & ARM_VECTOR_TABLE_ALIGNMENT) == 0);

-

-  // Write the Monitor Mode Vector Table Address

-  ArmWriteMVBar ((UINTN) &MonitorVectorTable);

-}

-

diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.S b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.S
deleted file mode 100644
index 3e75bee505..0000000000
--- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/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 <AsmMacroIoLib.h>

-#include <AutoGen.h>

-#include <Library/PcdLib.h>

-

-.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
deleted file mode 100644
index f4f515d05c..0000000000
--- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/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 <Library/PcdLib.h>

-

-    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
deleted file mode 100644
index 505d2ec0c0..0000000000
--- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.inf
+++ /dev/null
@@ -1,40 +0,0 @@
-#/* @file

-#  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

-#  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.

-#

-#*/

-

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = ArmTrustedMonitorLibNull

-  FILE_GUID                      = c4b50eb2-ed16-4283-a5b0-a7341c3f997b

-  MODULE_TYPE                    = BASE

-  VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = ArmTrustedMonitorLib

-

-[Sources.ARM]

-  Arm/ArmTrustedMonitorLibNull.c

-  Arm/MonitorTable.asm     | RVCT

-  Arm/MonitorTable.S       | GCC

-

-[Sources.AARCH64]

-  AArch64/ArmTrustedMonitorLibNull.c

-

-[Packages]

-  ArmPkg/ArmPkg.dec

-  ArmPlatformPkg/ArmPlatformPkg.dec

-  MdePkg/MdePkg.dec

-

-[LibraryClasses]

-  ArmLib

-  BaseLib

-  DebugLib

-  PcdLib

-