MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull

RecoveryLib.h and PeiRecoveryLibNull have been deprecated from 2009,
so remove them.
https://bugzilla.tianocore.org/show_bug.cgi?id=1299

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index ebed1c902ed2dcde2b78608c3051e3786bbb94df..bc0d41f406ea1fb3af680fa4c52af00d11dd5506 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
@@ -39,7 +39,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/PcdLib.h>\r
-#include <Library/RecoveryLib.h>\r
 #include <Library/DebugAgentLib.h>\r
 #include <Library/PeiServicesTablePointerLib.h>\r
 #include <Library/PerformanceLib.h>\r

diff --git a/MdeModulePkg/Include/Library/RecoveryLib.h b/MdeModulePkg/Include/Library/RecoveryLib.h
deleted file mode 100644 (file)
index 0324bd6..0000000
--- a/MdeModulePkg/Include/Library/RecoveryLib.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/** @file\r
-  Recovery library class defines a set of methods related recovery boot mode.\r
-  This library class is no longer used and modules using this library should\r
-  directly locate EFI_PEI_RECOVERY_MODULE_PPI, defined in the PI 1.2 specification.\r
-\r
-Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r
-SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-\r
-#ifndef __RECOVERY_LIB_H__\r
-#define __RECOVERY_LIB_H__\r
-\r
-/**\r
-  Calling this function causes the system to carry out a recovery boot path.\r
-\r
-  @retval EFI_SUCCESS   Recovery boot path succeeded.\r
-  @retval Others        Recovery boot path failure.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-PeiRecoverFirmware (\r
-  VOID\r
-  );\r
-\r
-#endif\r
-\r
-\r

diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
deleted file mode 100644 (file)
index a948b37..0000000
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/** @file\r
-  Null Recovery Library instance does nothing and returns unsupported status.\r
-\r
-  This library instance is no longer used and module using this library\r
-  class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined\r
-  in PI 1.2 specification.\r
-\r
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
-SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-#include <PiPei.h>\r
-#include <Library/RecoveryLib.h>\r
-\r
-/**\r
-  Calling this function causes the system do recovery boot path.\r
-\r
-  @retval EFI_UNSUPPORTED       Recovery is not supported.\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-PeiRecoverFirmware (\r
-  VOID\r
-  )\r
-{\r
-  return EFI_UNSUPPORTED;\r
-}\r
-\r

diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
deleted file mode 100644 (file)
index 325c4e7..0000000
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
+++ /dev/null
@@ -1,33 +0,0 @@
-## @file\r
-#  Null Recovery library instance for PEIM module\r
-#  This library instance is no longer used and module using this library\r
-#  class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined\r
-#  in PI 1.2 specification.\r
-#\r
-#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
-#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
-#\r
-##\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = PeiRecoveryLibNull\r
-  MODULE_UNI_FILE                = PeiRecoveryLibNull.uni\r
-  FILE_GUID                      = 41789FB9-02AC-4484-BD40-A3147D7EDA25\r
-  MODULE_TYPE                    = PEIM\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = RecoveryLib|PEIM\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 EBC (EBC is for build only)\r
-#\r
-\r
-[Sources]\r
-  PeiRecoveryLibNull.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  MdeModulePkg/MdeModulePkg.dec\r
-\r

diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
deleted file mode 100644 (file)
index 36091d7..0000000
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
+++ /dev/null
@@ -1,18 +0,0 @@
-// /** @file\r
-// Null Recovery library instance for PEIM module\r
-//\r
-// This library instance is no longer used and module using this library\r
-// class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined\r
-// in PI 1.2 specification.\r
-//\r
-// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
-//\r
-// SPDX-License-Identifier: BSD-2-Clause-Patent\r
-//\r
-// **/\r
-\r
-\r
-#string STR_MODULE_ABSTRACT             #language en-US "Null Recovery library instance for PEIM module"\r
-\r
-#string STR_MODULE_DESCRIPTION          #language en-US "This library instance is no longer used and module using this library class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined in PI 1.2 Specification."\r
-\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 60c69feeaa23764793a340945569112549b59512..c4139753d3f39a09850f4b19f32afcb2337b7dd4 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -31,11 +31,6 @@
   ##  @libraryclass  Defines a set of helper functions for resetting the system.\r
   ResetUtilityLib|Include/Library/ResetUtilityLib.h\r
 \r
-  ##  @libraryclass  Defines a set of methods related recovery mode.\r
-  #   This library class is no longer used and modules using this library should\r
-  #   directly locate EFI_PEI_RECOVERY_MODULE_PPI defined in PI 1.2 specification.\r
-  RecoveryLib|Include/Library/RecoveryLib.h\r
-\r
   ##  @libraryclass  Provides HII related functions.\r
   HiiLib|Include/Library/HiiLib.h\r
 \r

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 1c4525cd588ca9019bbdf0fd73a9e6e1eadc88b2..4320839abfb567cbb93e0add82feffc8e86a3604 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -282,7 +282,6 @@
   MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.inf\r
   MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf\r
   MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf\r
-  MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf\r
   MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.inf\r
   MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf\r
   MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf\r