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>

7 files changed, 0 insertions, 115 deletions

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index ebed1c902e..bc0d41f406 100644
--- 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>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/PcdLib.h>

-#include <Library/RecoveryLib.h>

 #include <Library/DebugAgentLib.h>

 #include <Library/PeiServicesTablePointerLib.h>

 #include <Library/PerformanceLib.h>

diff --git a/MdeModulePkg/Include/Library/RecoveryLib.h b/MdeModulePkg/Include/Library/RecoveryLib.h
deleted file mode 100644
index 0324bd65ed..0000000000
--- a/MdeModulePkg/Include/Library/RecoveryLib.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/** @file

-  Recovery library class defines a set of methods related recovery boot mode.

-  This library class is no longer used and modules using this library should

-  directly locate EFI_PEI_RECOVERY_MODULE_PPI, defined in the PI 1.2 specification.

-

-Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>

-SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-

-#ifndef __RECOVERY_LIB_H__

-#define __RECOVERY_LIB_H__

-

-/**

-  Calling this function causes the system to carry out a recovery boot path.

-

-  @retval EFI_SUCCESS   Recovery boot path succeeded.

-  @retval Others        Recovery boot path failure.

-

-**/

-EFI_STATUS

-EFIAPI

-PeiRecoverFirmware (

-  VOID

-  );

-

-#endif

-

-

diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
deleted file mode 100644
index a948b37684..0000000000
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/** @file

-  Null Recovery Library instance does nothing and returns unsupported status.

-

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

-

-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

-SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-#include <PiPei.h>

-#include <Library/RecoveryLib.h>

-

-/**

-  Calling this function causes the system do recovery boot path.

-

-  @retval EFI_UNSUPPORTED       Recovery is not supported.

-**/

-EFI_STATUS

-EFIAPI

-PeiRecoverFirmware (

-  VOID

-  )

-{

-  return EFI_UNSUPPORTED;

-}

-

diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
deleted file mode 100644
index 325c4e717d..0000000000
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
+++ /dev/null
@@ -1,33 +0,0 @@
-## @file

-#  Null Recovery library instance for PEIM module

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

-#

-#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

-#  SPDX-License-Identifier: BSD-2-Clause-Patent

-#

-##

-

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = PeiRecoveryLibNull

-  MODULE_UNI_FILE                = PeiRecoveryLibNull.uni

-  FILE_GUID                      = 41789FB9-02AC-4484-BD40-A3147D7EDA25

-  MODULE_TYPE                    = PEIM

-  VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = RecoveryLib|PEIM

-

-#

-# The following information is for reference only and not required by the build tools.

-#

-#  VALID_ARCHITECTURES           = IA32 X64 EBC (EBC is for build only)

-#

-

-[Sources]

-  PeiRecoveryLibNull.c

-

-[Packages]

-  MdePkg/MdePkg.dec

-  MdeModulePkg/MdeModulePkg.dec

-

diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
deleted file mode 100644
index 36091d7f62..0000000000
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
+++ /dev/null
@@ -1,18 +0,0 @@
-// /** @file

-// Null Recovery library instance for PEIM module

-//

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

-//

-// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

-//

-// SPDX-License-Identifier: BSD-2-Clause-Patent

-//

-// **/

-

-

-#string STR_MODULE_ABSTRACT             #language en-US "Null Recovery library instance for PEIM module"

-

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

-

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 60c69feeaa..c4139753d3 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -31,11 +31,6 @@
   ##  @libraryclass  Defines a set of helper functions for resetting the system.

   ResetUtilityLib|Include/Library/ResetUtilityLib.h

 

-  ##  @libraryclass  Defines a set of methods related recovery mode.

-  #   This library class is no longer used and modules using this library should

-  #   directly locate EFI_PEI_RECOVERY_MODULE_PPI defined in PI 1.2 specification.

-  RecoveryLib|Include/Library/RecoveryLib.h

-

   ##  @libraryclass  Provides HII related functions.

   HiiLib|Include/Library/HiiLib.h

 

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 1c4525cd58..4320839abf 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -282,7 +282,6 @@
   MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.inf

   MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf

   MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf

-  MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf

   MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.inf

   MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

   MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf