* [PATCH 0/2] Remove S3Lib and RecoveryLib
@ 2019-08-02 6:55 Zhang, Shenglei
2019-08-02 6:55 ` [PATCH 1/2] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull Zhang, Shenglei
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Zhang, Shenglei @ 2019-08-02 6:55 UTC (permalink / raw)
To: devel; +Cc: Jian J Wang, Hao A Wu
S3Lib and RecoveryLib have been deprecated since 2009.
There is no code using AcpiS3ResumeOs() interface in S3Lib and
PeiRecoverFirmware() interface in RecoveryLib.
So they can be removed from edk2 repo.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Shenglei Zhang (2):
MdeModulePkg: Remove S3Lib.h and PeiS3LibNull
MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull
.../PeiRecoveryLibNull/PeiRecoveryLibNull.c | 28 ---------------
.../Library/PeiS3LibNull/PeiS3LibNull.c | 29 ----------------
MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 2 --
MdeModulePkg/Include/Library/RecoveryLib.h | 29 ----------------
MdeModulePkg/Include/Library/S3Lib.h | 28 ---------------
.../PeiRecoveryLibNull/PeiRecoveryLibNull.inf | 33 ------------------
.../PeiRecoveryLibNull/PeiRecoveryLibNull.uni | 18 ----------
.../Library/PeiS3LibNull/PeiS3LibNull.inf | 34 -------------------
.../Library/PeiS3LibNull/PeiS3LibNull.uni | 18 ----------
MdeModulePkg/MdeModulePkg.dec | 10 ------
MdeModulePkg/MdeModulePkg.dsc | 2 --
11 files changed, 231 deletions(-)
delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
delete mode 100644 MdeModulePkg/Include/Library/RecoveryLib.h
delete mode 100644 MdeModulePkg/Include/Library/S3Lib.h
delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
--
2.18.0.windows.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull 2019-08-02 6:55 [PATCH 0/2] Remove S3Lib and RecoveryLib Zhang, Shenglei @ 2019-08-02 6:55 ` Zhang, Shenglei 2019-08-02 15:13 ` [edk2-devel] " Ni, Ray 2019-08-02 6:55 ` [PATCH 2/2] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull Zhang, Shenglei 2019-08-05 2:13 ` [edk2-devel] [PATCH 0/2] Remove S3Lib and RecoveryLib Wu, Hao A 2 siblings, 1 reply; 6+ messages in thread From: Zhang, Shenglei @ 2019-08-02 6:55 UTC (permalink / raw) To: devel; +Cc: Jian J Wang, Hao A Wu, Ray Ni, Star Zeng S3Lib.h and PeiS3LibNull have been deprecated since 2009, so remove them. https://bugzilla.tianocore.org/show_bug.cgi?id=1299 Cc: Jian J Wang <jian.j.wang@intel.com> Cc: Hao A Wu <hao.a.wu@intel.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Star Zeng <star.zeng@intel.com> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com> --- .../Library/PeiS3LibNull/PeiS3LibNull.c | 29 ---------------- MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 1 - MdeModulePkg/Include/Library/S3Lib.h | 28 --------------- .../Library/PeiS3LibNull/PeiS3LibNull.inf | 34 ------------------- .../Library/PeiS3LibNull/PeiS3LibNull.uni | 18 ---------- MdeModulePkg/MdeModulePkg.dec | 5 --- MdeModulePkg/MdeModulePkg.dsc | 1 - 7 files changed, 116 deletions(-) delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c delete mode 100644 MdeModulePkg/Include/Library/S3Lib.h delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c deleted file mode 100644 index a864413bc891..000000000000 --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c +++ /dev/null @@ -1,29 +0,0 @@ -/** @file - Null S3 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_S3_RESUME_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/S3Lib.h> - -/** - This function is responsible for calling the S3 resume vector in the ACPI Tables. - - @retval EFI_SUCESS Success to restore config from S3. - @retval Others Fail to restore config from S3. -**/ -EFI_STATUS -EFIAPI -AcpiS3ResumeOs ( - VOID - ) -{ - return EFI_UNSUPPORTED; -} - diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h index 90b5b5b21199..ebed1c902ed2 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/S3Lib.h> #include <Library/RecoveryLib.h> #include <Library/DebugAgentLib.h> #include <Library/PeiServicesTablePointerLib.h> diff --git a/MdeModulePkg/Include/Library/S3Lib.h b/MdeModulePkg/Include/Library/S3Lib.h deleted file mode 100644 index 171c0ccb92db..000000000000 --- a/MdeModulePkg/Include/Library/S3Lib.h +++ /dev/null @@ -1,28 +0,0 @@ -/** @file - S3 library class defines a set of methods related to S3 boot mode. - This library class is no longer used and modules using this library should - directly locate EFI_PEI_S3_RESUME_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 __S3_LIB_H__ -#define __S3_LIB_H__ - -/** - This function is responsible for calling the S3 resume vector in the ACPI Tables. - - @retval EFI_SUCCESS Successfully restored the configuration from S3. - @retval Others Failed to restore the configuration from S3. - -**/ -EFI_STATUS -EFIAPI -AcpiS3ResumeOs ( - VOID - ); - -#endif - diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf deleted file mode 100644 index 3076c17d5cdd..000000000000 --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf +++ /dev/null @@ -1,34 +0,0 @@ -## @file -# Null S3 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_S3_RESUME_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 = PeiS3LibNull - MODULE_UNI_FILE = PeiS3LibNull.uni - FILE_GUID = 018E1925-D6A2-4a2a-8958-817610A15ADF - MODULE_TYPE = PEIM - VERSION_STRING = 1.0 - LIBRARY_CLASS = S3Lib|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] - PeiS3LibNull.c - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni deleted file mode 100644 index 97ec62979ee0..000000000000 --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni +++ /dev/null @@ -1,18 +0,0 @@ -// /** @file -// Null S3 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_S3_RESUME_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 S3 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_S3_RESUME_PPI defined in PI 1.2 Specification." - diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 12e0bbf57997..60c69feeaa23 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 do S3 mode. - # This library class is no longer used and modules using this library should - # directly locate EFI_PEI_S3_RESUME_PPI defined in PI 1.2 specification. - S3Lib|Include/Library/S3Lib.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. diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index 6ca7d9ade4e1..1c4525cd588c 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -284,7 +284,6 @@ [Components] MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.inf - MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf -- 2.18.0.windows.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH 1/2] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull 2019-08-02 6:55 ` [PATCH 1/2] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull Zhang, Shenglei @ 2019-08-02 15:13 ` Ni, Ray 0 siblings, 0 replies; 6+ messages in thread From: Ni, Ray @ 2019-08-02 15:13 UTC (permalink / raw) To: devel@edk2.groups.io, Zhang, Shenglei; +Cc: Wang, Jian J, Wu, Hao A, Zeng, Star Reviewed-by: Ray Ni <ray.ni@intel.com> > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Zhang, Shenglei > Sent: Friday, August 2, 2019 2:55 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>; Zeng, Star > <star.zeng@intel.com> > Subject: [edk2-devel] [PATCH 1/2] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull > > S3Lib.h and PeiS3LibNull have been deprecated since 2009, so remove them. > https://bugzilla.tianocore.org/show_bug.cgi?id=1299 > > Cc: Jian J Wang <jian.j.wang@intel.com> > Cc: Hao A Wu <hao.a.wu@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Cc: Star Zeng <star.zeng@intel.com> > Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com> > --- > .../Library/PeiS3LibNull/PeiS3LibNull.c | 29 ---------------- > MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 1 - > MdeModulePkg/Include/Library/S3Lib.h | 28 --------------- > .../Library/PeiS3LibNull/PeiS3LibNull.inf | 34 ------------------- > .../Library/PeiS3LibNull/PeiS3LibNull.uni | 18 ---------- > MdeModulePkg/MdeModulePkg.dec | 5 --- > MdeModulePkg/MdeModulePkg.dsc | 1 - > 7 files changed, 116 deletions(-) > delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c > delete mode 100644 MdeModulePkg/Include/Library/S3Lib.h > delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf > delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni > > diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c > deleted file mode 100644 > index a864413bc891..000000000000 > --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c > +++ /dev/null > @@ -1,29 +0,0 @@ > -/** @file > - Null S3 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_S3_RESUME_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/S3Lib.h> > - > -/** > - This function is responsible for calling the S3 resume vector in the ACPI Tables. > - > - @retval EFI_SUCESS Success to restore config from S3. > - @retval Others Fail to restore config from S3. > -**/ > -EFI_STATUS > -EFIAPI > -AcpiS3ResumeOs ( > - VOID > - ) > -{ > - return EFI_UNSUPPORTED; > -} > - > diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h > index 90b5b5b21199..ebed1c902ed2 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/S3Lib.h> > #include <Library/RecoveryLib.h> > #include <Library/DebugAgentLib.h> > #include <Library/PeiServicesTablePointerLib.h> > diff --git a/MdeModulePkg/Include/Library/S3Lib.h b/MdeModulePkg/Include/Library/S3Lib.h > deleted file mode 100644 > index 171c0ccb92db..000000000000 > --- a/MdeModulePkg/Include/Library/S3Lib.h > +++ /dev/null > @@ -1,28 +0,0 @@ > -/** @file > - S3 library class defines a set of methods related to S3 boot mode. > - This library class is no longer used and modules using this library should > - directly locate EFI_PEI_S3_RESUME_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 __S3_LIB_H__ > -#define __S3_LIB_H__ > - > -/** > - This function is responsible for calling the S3 resume vector in the ACPI Tables. > - > - @retval EFI_SUCCESS Successfully restored the configuration from S3. > - @retval Others Failed to restore the configuration from S3. > - > -**/ > -EFI_STATUS > -EFIAPI > -AcpiS3ResumeOs ( > - VOID > - ); > - > -#endif > - > diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf > deleted file mode 100644 > index 3076c17d5cdd..000000000000 > --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf > +++ /dev/null > @@ -1,34 +0,0 @@ > -## @file > -# Null S3 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_S3_RESUME_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 = PeiS3LibNull > - MODULE_UNI_FILE = PeiS3LibNull.uni > - FILE_GUID = 018E1925-D6A2-4a2a-8958-817610A15ADF > - MODULE_TYPE = PEIM > - VERSION_STRING = 1.0 > - LIBRARY_CLASS = S3Lib|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] > - PeiS3LibNull.c > - > -[Packages] > - MdePkg/MdePkg.dec > - MdeModulePkg/MdeModulePkg.dec > diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni > deleted file mode 100644 > index 97ec62979ee0..000000000000 > --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni > +++ /dev/null > @@ -1,18 +0,0 @@ > -// /** @file > -// Null S3 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_S3_RESUME_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 S3 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_S3_RESUME_PPI defined in PI 1.2 Specification." > - > diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec > index 12e0bbf57997..60c69feeaa23 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 do S3 mode. > - # This library class is no longer used and modules using this library should > - # directly locate EFI_PEI_S3_RESUME_PPI defined in PI 1.2 specification. > - S3Lib|Include/Library/S3Lib.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. > diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc > index 6ca7d9ade4e1..1c4525cd588c 100644 > --- a/MdeModulePkg/MdeModulePkg.dsc > +++ b/MdeModulePkg/MdeModulePkg.dsc > @@ -284,7 +284,6 @@ [Components] > MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf > MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf > MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.inf > - MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf > MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf > MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf > MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf > -- > 2.18.0.windows.1 > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull 2019-08-02 6:55 [PATCH 0/2] Remove S3Lib and RecoveryLib Zhang, Shenglei 2019-08-02 6:55 ` [PATCH 1/2] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull Zhang, Shenglei @ 2019-08-02 6:55 ` Zhang, Shenglei 2019-08-02 15:13 ` Ni, Ray 2019-08-05 2:13 ` [edk2-devel] [PATCH 0/2] Remove S3Lib and RecoveryLib Wu, Hao A 2 siblings, 1 reply; 6+ messages in thread From: Zhang, Shenglei @ 2019-08-02 6:55 UTC (permalink / raw) To: devel; +Cc: Jian J Wang, Hao A Wu, Ray Ni, Star Zeng, Shenglei 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: Hao A Wu <hao.a.wu@intel.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Star Zeng <star.zeng@intel.com> Signed-off-by: Shenglei Zhang <shenglei.zhang@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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull 2019-08-02 6:55 ` [PATCH 2/2] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull Zhang, Shenglei @ 2019-08-02 15:13 ` Ni, Ray 0 siblings, 0 replies; 6+ messages in thread From: Ni, Ray @ 2019-08-02 15:13 UTC (permalink / raw) To: Zhang, Shenglei, devel@edk2.groups.io Cc: Wang, Jian J, Wu, Hao A, Zeng, Star, Zhang, Shenglei Reviewed-by: Ray Ni <ray.ni@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.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>; Zeng, Star > <star.zeng@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.wang@intel.com> > Cc: Hao A Wu <hao.a.wu@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Cc: Star Zeng <star.zeng@intel.com> > Signed-off-by: Shenglei Zhang <shenglei.zhang@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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH 0/2] Remove S3Lib and RecoveryLib 2019-08-02 6:55 [PATCH 0/2] Remove S3Lib and RecoveryLib Zhang, Shenglei 2019-08-02 6:55 ` [PATCH 1/2] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull Zhang, Shenglei 2019-08-02 6:55 ` [PATCH 2/2] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull Zhang, Shenglei @ 2019-08-05 2:13 ` Wu, Hao A 2 siblings, 0 replies; 6+ messages in thread From: Wu, Hao A @ 2019-08-05 2:13 UTC (permalink / raw) To: devel@edk2.groups.io, Zhang, Shenglei; +Cc: Wang, Jian J > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Zhang, Shenglei > Sent: Friday, August 02, 2019 2:55 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J; Wu, Hao A > Subject: [edk2-devel] [PATCH 0/2] Remove S3Lib and RecoveryLib > > S3Lib and RecoveryLib have been deprecated since 2009. > There is no code using AcpiS3ResumeOs() interface in S3Lib and > PeiRecoverFirmware() interface in RecoveryLib. > So they can be removed from edk2 repo. For the series: Reviewed-by: Hao A Wu <hao.a.wu@intel.com> And pushed via commits 1702e2ce5a..4ac8ceb5d6. Best Regards, Hao Wu > > Cc: Jian J Wang <jian.j.wang@intel.com> > Cc: Hao A Wu <hao.a.wu@intel.com> > Shenglei Zhang (2): > MdeModulePkg: Remove S3Lib.h and PeiS3LibNull > MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull > > .../PeiRecoveryLibNull/PeiRecoveryLibNull.c | 28 --------------- > .../Library/PeiS3LibNull/PeiS3LibNull.c | 29 ---------------- > MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 2 -- > MdeModulePkg/Include/Library/RecoveryLib.h | 29 ---------------- > MdeModulePkg/Include/Library/S3Lib.h | 28 --------------- > .../PeiRecoveryLibNull/PeiRecoveryLibNull.inf | 33 ------------------ > .../PeiRecoveryLibNull/PeiRecoveryLibNull.uni | 18 ---------- > .../Library/PeiS3LibNull/PeiS3LibNull.inf | 34 ------------------- > .../Library/PeiS3LibNull/PeiS3LibNull.uni | 18 ---------- > MdeModulePkg/MdeModulePkg.dec | 10 ------ > MdeModulePkg/MdeModulePkg.dsc | 2 -- > 11 files changed, 231 deletions(-) > delete mode 100644 > MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c > delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c > delete mode 100644 MdeModulePkg/Include/Library/RecoveryLib.h > delete mode 100644 MdeModulePkg/Include/Library/S3Lib.h > delete mode 100644 > MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf > delete mode 100644 > MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni > delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf > delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni > > -- > 2.18.0.windows.1 > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-08-05 2:13 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-08-02 6:55 [PATCH 0/2] Remove S3Lib and RecoveryLib Zhang, Shenglei 2019-08-02 6:55 ` [PATCH 1/2] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull Zhang, Shenglei 2019-08-02 15:13 ` [edk2-devel] " Ni, Ray 2019-08-02 6:55 ` [PATCH 2/2] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull Zhang, Shenglei 2019-08-02 15:13 ` Ni, Ray 2019-08-05 2:13 ` [edk2-devel] [PATCH 0/2] Remove S3Lib and RecoveryLib Wu, Hao A
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox