ArmPkg/ArmLib: remove NullArmLib

Remove the NULL instance of ArmLib: it is not currently used, and its
usefulness its dubious.

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

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 6f9fc661fbdc4cd179c176a01dab0784cc74ed04..e26ca035f55572efb1cf6f6c7dfe6ed6334ab3b4 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -111,7 +111,6 @@
   ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf\r
   ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
   ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf\r
-  ArmPkg/Library/ArmLib/Null/NullArmLib.inf\r
   ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf\r
   ArmPkg/Library/BdsLib/BdsLib.inf\r
   ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r

diff --git a/ArmPkg/Library/ArmLib/Null/NullArmLib.c b/ArmPkg/Library/ArmLib/Null/NullArmLib.c
deleted file mode 100644 (file)
index e7e9c52..0000000
--- a/ArmPkg/Library/ArmLib/Null/NullArmLib.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/** @file\r
-\r
-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\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 <Uefi.h>\r
-#include <Library/ArmLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-VOID\r
-EFIAPI\r
-ArmCleanInvalidateDataCache (\r
-  VOID\r
-  )\r
-{\r
-  // Do not run code using the Null cache library.\r
-  ASSERT(FALSE);\r
-}\r
-\r
-VOID\r
-EFIAPI\r
-ArmCleanDataCache (\r
-  VOID\r
-  )\r
-{\r
-  // Do not run code using the Null cache library.\r
-  ASSERT(FALSE);\r
-}\r
-\r
-VOID\r
-EFIAPI\r
-ArmInvalidateInstructionCache (\r
-  VOID\r
-  )\r
-{\r
-  // Do not run code using the Null cache library.\r
-  ASSERT(FALSE);\r
-}\r
-\r
-VOID\r
-EFIAPI\r
-ArmInvalidateDataCacheEntryByMVA (\r
-  IN  UINTN Address\r
-  )\r
-{\r
-  // Do not run code using the Null cache library.\r
-  ASSERT(FALSE);\r
-}\r
-\r
-VOID\r
-EFIAPI\r
-ArmCleanDataCacheEntryByMVA (\r
-  IN  UINTN Address\r
-  )\r
-{\r
-  // Do not run code using the Null cache library.\r
-  ASSERT(FALSE);\r
-}\r
-\r
-VOID\r
-EFIAPI\r
-ArmCleanInvalidateDataCacheEntryByMVA (\r
-  IN  UINTN Address\r
-  )\r
-{\r
-  // Do not run code using the Null cache library.\r
-  ASSERT(FALSE);\r
-}\r
-\r
-VOID\r
-EFIAPI\r
-ArmEnableDataCache (\r
-  VOID\r
-  )\r
-{\r
-  // Do not run code using the Null cache library.\r
-  ASSERT(FALSE);\r
-}\r
-\r
-VOID\r
-EFIAPI\r
-ArmDisableDataCache (\r
-  VOID\r
-  )\r
-{\r
-  // Do not run code using the Null cache library.\r
-  ASSERT(FALSE);\r
-}\r
-\r
-VOID\r
-EFIAPI\r
-ArmEnableInstructionCache (\r
-  VOID\r
-  )\r
-{\r
-  // Do not run code using the Null cache library.\r
-  ASSERT(FALSE);\r
-}\r
-\r
-VOID\r
-EFIAPI\r
-ArmDisableInstructionCache (\r
-  VOID\r
-  )\r
-{\r
-  // Do not run code using the Null cache library.\r
-  ASSERT(FALSE);\r
-}\r

diff --git a/ArmPkg/Library/ArmLib/Null/NullArmLib.inf b/ArmPkg/Library/ArmLib/Null/NullArmLib.inf
deleted file mode 100644 (file)
index 6cfb2c4..0000000
--- a/ArmPkg/Library/ArmLib/Null/NullArmLib.inf
+++ /dev/null
@@ -1,41 +0,0 @@
-#/** @file\r
-# Semihosting  serail port lib\r
-#\r
-# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>\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
-#  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
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = NullArmLib\r
-  FILE_GUID                      = 00586300-0E06-4790-AC44-86C56ACBB942\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = ArmLib\r
-\r
-[Sources.common]\r
-  ../Common/ArmLib.c\r
-\r
-  NullArmLib.c\r
-\r
-[Sources.ARM]\r
-  ../Common/Arm/ArmLibSupport.S    | GCC\r
-  ../Common/Arm/ArmLibSupport.asm  | RVCT\r
-\r
-[Sources.AARCH64]\r
-  ../Common/AArch64/ArmLibSupport.S\r
-\r
-[Packages]\r
-  ArmPkg/ArmPkg.dec\r
-  MdePkg/MdePkg.dec\r
-\r
-[Protocols]\r
-  gEfiCpuArchProtocolGuid\r