Reviewed-by: Ray Ni <ray...@intel.com> > -----Original Message----- > From: Zhang, Shenglei > Sent: Friday, August 2, 2019 2:55 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J <jian.j.w...@intel.com>; Wu, Hao A <hao.a...@intel.com>; Ni, > Ray <ray...@intel.com>; Zeng, Star > <star.z...@intel.com>; Shenglei > Subject: [PATCH 2/2] 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.w...@intel.com> > Cc: Hao A Wu <hao.a...@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Star Zeng <star.z...@intel.com> > Signed-off-by: Shenglei Zhang <shenglei.zh...@intel.com > --- > .../PeiRecoveryLibNull/PeiRecoveryLibNull.c | 28 ---------------- > MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 1 - > MdeModulePkg/Include/Library/RecoveryLib.h | 29 ---------------- > .../PeiRecoveryLibNull/PeiRecoveryLibNull.inf | 33 ------------------- > .../PeiRecoveryLibNull/PeiRecoveryLibNull.uni | 18 ---------- > MdeModulePkg/MdeModulePkg.dec | 5 --- > MdeModulePkg/MdeModulePkg.dsc | 1 - > 7 files changed, 115 deletions(-) > delete mode 100644 > MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c > delete mode 100644 MdeModulePkg/Include/Library/RecoveryLib.h > delete mode 100644 > MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf > delete mode 100644 > MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni > > diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c > b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c > deleted file mode 100644 > index a948b3768477..000000000000 > --- 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/Core/DxeIplPeim/DxeIpl.h > b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h > index ebed1c902ed2..bc0d41f406ea 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 0324bd65ed62..000000000000 > --- 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.inf > b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf > deleted file mode 100644 > index 325c4e717d6e..000000000000 > --- 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 36091d7f62df..000000000000 > --- 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 60c69feeaa23..c4139753d3f3 100644 > --- a/MdeModulePkg/MdeModulePkg.dec > +++ b/MdeModulePkg/MdeModulePkg.dec > @@ -31,11 +31,6 @@ [LibraryClasses] > ## @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 1c4525cd588c..4320839abfb5 100644 > --- a/MdeModulePkg/MdeModulePkg.dsc > +++ b/MdeModulePkg/MdeModulePkg.dsc > @@ -282,7 +282,6 @@ [Components] > > 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 > -- > 2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44861): https://edk2.groups.io/g/devel/message/44861 Mute This Topic: https://groups.io/mt/32688088/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
