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>

diff --git a/ArmPlatformPkg/Include/Library/ArmTrustedMonitorLib.h b/ArmPlatformPkg/Include/Library/ArmTrustedMonitorLib.h
deleted file mode 100644 (file)
index 5368697..0000000
--- a/ArmPlatformPkg/Include/Library/ArmTrustedMonitorLib.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/** @file\r
-*  Main file supporting the Monitor World on ARM PLatforms\r
-*\r
-*  Copyright (c) 2011, ARM Limited. All rights reserved.\r
-*\r
-*  This program and the accompanying materials\r
-*  are licensed and made available under the terms and conditions of the BSD License\r
-*  which accompanies this distribution.  The full text of the license may be found at\r
-*  http://opensource.org/licenses/bsd-license.php\r
-*\r
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-*\r
-**/\r
-\r
-#ifndef __ARM_TRUSTED_MONITOR_LIB_H_\r
-#define __ARM_TRUSTED_MONITOR_LIB_H_\r
-\r
-VOID\r
-ArmSecureMonitorWorldInitialize (\r
-  VOID\r
-  );\r
-\r
-#endif\r

diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/AArch64/ArmTrustedMonitorLibNull.c b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/AArch64/ArmTrustedMonitorLibNull.c
deleted file mode 100644 (file)
index 72c62d7..0000000
--- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/AArch64/ArmTrustedMonitorLibNull.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/** @file\r
-*  Main file supporting the Monitor World on ARM PLatforms\r
-*\r
-*  Copyright (c) 2012-2013, ARM Limited. All rights reserved.\r
-*\r
-*  This program and the accompanying materials\r
-*  are licensed and made available under the terms and conditions of the BSD License\r
-*  which accompanies this distribution.  The full text of the license may be found at\r
-*  http://opensource.org/licenses/bsd-license.php\r
-*\r
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-*\r
-**/\r
-\r
-VOID\r
-ArmSecureMonitorWorldInitialize (\r
-  VOID\r
-  )\r
-{\r
-  // Do not touch the EL3 Exception Vector Table Register.\r
-  // The default default DebugAgentLib could have already set its own vector\r
-  // into EL3 to catch abort exceptions.\r
-}\r

diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/ArmTrustedMonitorLibNull.c b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/ArmTrustedMonitorLibNull.c
deleted file mode 100644 (file)
index 1f950d7..0000000
--- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/ArmTrustedMonitorLibNull.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/** @file\r
-*  Main file supporting the Monitor World on ARM PLatforms\r
-*\r
-*  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
-*\r
-*  This program and the accompanying materials\r
-*  are licensed and made available under the terms and conditions of the BSD License\r
-*  which accompanies this distribution.  The full text of the license may be found at\r
-*  http://opensource.org/licenses/bsd-license.php\r
-*\r
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-*\r
-**/\r
-\r
-#include <Library/ArmLib.h>\r
-#include <Library/ArmTrustedMonitorLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#define IS_ALIGNED(Address, Align) (((UINTN)Address & (Align-1)) == 0)\r
-\r
-VOID\r
-MonitorVectorTable (\r
-  VOID\r
-  );\r
-\r
-VOID\r
-ArmSecureMonitorWorldInitialize (\r
-  VOID\r
-  )\r
-{\r
-  // Ensure the Monitor Table is 32bit aligned\r
-  ASSERT (((UINTN)&MonitorVectorTable & ARM_VECTOR_TABLE_ALIGNMENT) == 0);\r
-\r
-  // Write the Monitor Mode Vector Table Address\r
-  ArmWriteMVBar ((UINTN) &MonitorVectorTable);\r
-}\r
-\r

diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.S b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.S
deleted file mode 100644 (file)
index 3e75bee..0000000
--- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.S
+++ /dev/null
@@ -1,41 +0,0 @@
-//\r
-//  Copyright (c) 2011, ARM Limited. All rights reserved.\r
-//\r
-//  This program and the accompanying materials\r
-//  are licensed and made available under the terms and conditions of the BSD License\r
-//  which accompanies this distribution.  The full text of the license may be found at\r
-//  http://opensource.org/licenses/bsd-license.php\r
-//\r
-//  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-//  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-//\r
-//\r
-\r
-#include <AsmMacroIoLib.h>\r
-#include <AutoGen.h>\r
-#include <Library/PcdLib.h>\r
-\r
-.text\r
-.align 5\r
-\r
-GCC_ASM_EXPORT(MonitorVectorTable)\r
-\r
-ASM_PFX(MonitorVectorTable):\r
-\r
-_MonitorResetEntry:\r
-  b   _MonitorResetEntry\r
-_MonitorUndefinedEntry:\r
-  b   _MonitorUndefinedEntry\r
-_MonitorSmcEntry:\r
-  b   _MonitorSmcEntry\r
-_MonitorPrefetchEntry:\r
-  b   _MonitorPrefetchEntry\r
-_MonitorDataAbortEntry:\r
-  b   _MonitorDataAbortEntry\r
-_MonitorReservedEntry:\r
-  b   _MonitorReservedEntry\r
-_MonitorIrqEntry:\r
-  b   _MonitorIrqEntry\r
-_MonitorFiqEntry:\r
-  b   _MonitorFiqEntry\r
-\r

diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.asm b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.asm
deleted file mode 100644 (file)
index f4f515d..0000000
--- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/Arm/MonitorTable.asm
+++ /dev/null
@@ -1,40 +0,0 @@
-//\r
-//  Copyright (c) 2011, ARM Limited. All rights reserved.\r
-//\r
-//  This program and the accompanying materials\r
-//  are licensed and made available under the terms and conditions of the BSD License\r
-//  which accompanies this distribution.  The full text of the license may be found at\r
-//  http://opensource.org/licenses/bsd-license.php\r
-//\r
-//  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-//  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-//\r
-//\r
-\r
-#include <Library/PcdLib.h>\r
-\r
-    EXPORT  MonitorVectorTable\r
-\r
-    PRESERVE8\r
-    AREA    MonitoVectorTableArea, CODE, READONLY, CODEALIGN, ALIGN=5\r
-\r
-MonitorVectorTable\r
-\r
-_MonitorResetEntry\r
-  b   _MonitorResetEntry\r
-_MonitorUndefinedEntry\r
-  b   _MonitorUndefinedEntry\r
-_MonitorSmcEntry\r
-  b   _MonitorSmcEntry\r
-_MonitorPrefetchEntry\r
-  b   _MonitorPrefetchEntry\r
-_MonitorDataAbortEntry\r
-  b   _MonitorDataAbortEntry\r
-_MonitorReservedEntry\r
-  b   _MonitorReservedEntry\r
-_MonitorIrqEntry\r
-  b   _MonitorIrqEntry\r
-_MonitorFiqEntry\r
-  b   _MonitorFiqEntry\r
-\r
-  END\r

diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.inf b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.inf
deleted file mode 100644 (file)
index 505d2ec..0000000
--- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.inf
+++ /dev/null
@@ -1,40 +0,0 @@
-#/* @file\r
-#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
-#\r
-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-#*/\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = ArmTrustedMonitorLibNull\r
-  FILE_GUID                      = c4b50eb2-ed16-4283-a5b0-a7341c3f997b\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = ArmTrustedMonitorLib\r
-\r
-[Sources.ARM]\r
-  Arm/ArmTrustedMonitorLibNull.c\r
-  Arm/MonitorTable.asm     | RVCT\r
-  Arm/MonitorTable.S       | GCC\r
-\r
-[Sources.AARCH64]\r
-  AArch64/ArmTrustedMonitorLibNull.c\r
-\r
-[Packages]\r
-  ArmPkg/ArmPkg.dec\r
-  ArmPlatformPkg/ArmPlatformPkg.dec\r
-  MdePkg/MdePkg.dec\r
-\r
-[LibraryClasses]\r
-  ArmLib\r
-  BaseLib\r
-  DebugLib\r
-  PcdLib\r
-\r