* [PATCH 0/4] Remove S3Lib and RecoveryLib
@ 2019-06-21 2:59 Zhang, Shenglei
2019-06-21 2:59 ` [PATCH 1/4] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull Zhang, Shenglei
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Zhang, Shenglei @ 2019-06-21 2:59 UTC (permalink / raw)
To: devel; +Cc: Jian J Wang, Hao A Wu, Ray Ni, Star Zeng, Liming Gao
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>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Shenglei Zhang (4):
MdeModulePkg: Remove S3Lib.h and PeiS3LibNull
IntelFrameworkModulePkg: Remove PeiS3Lib
MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull
IntelFrameworkModulePkg: Remove PeiRecoveryLib
.../Library/PeiRecoveryLib/PeiRecoveryLib.c | 44 ------------------
.../Library/PeiS3Lib/PeiS3Lib.c | 45 -------------------
.../PeiRecoveryLibNull/PeiRecoveryLibNull.c | 28 ------------
.../Library/PeiS3LibNull/PeiS3LibNull.c | 29 ------------
.../IntelFrameworkModulePkg.dsc | 2 -
.../Library/PeiRecoveryLib/PeiRecoveryLib.inf | 45 -------------------
.../Library/PeiRecoveryLib/PeiRecoveryLib.uni | 18 --------
.../Library/PeiS3Lib/PeiS3Lib.inf | 44 ------------------
.../Library/PeiS3Lib/PeiS3Lib.uni | 18 --------
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 -
18 files changed, 447 deletions(-)
delete mode 100644 IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
delete mode 100644 IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
delete mode 100644 IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.uni
delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni
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/4] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull
2019-06-21 2:59 [PATCH 0/4] Remove S3Lib and RecoveryLib Zhang, Shenglei
@ 2019-06-21 2:59 ` Zhang, Shenglei
2019-06-21 2:59 ` [PATCH 2/4] IntelFrameworkModulePkg: Remove PeiS3Lib Zhang, Shenglei
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Zhang, Shenglei @ 2019-06-21 2:59 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 08b3cbd7f2a1..563fc1818531 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
* [PATCH 2/4] IntelFrameworkModulePkg: Remove PeiS3Lib
2019-06-21 2:59 [PATCH 0/4] Remove S3Lib and RecoveryLib Zhang, Shenglei
2019-06-21 2:59 ` [PATCH 1/4] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull Zhang, Shenglei
@ 2019-06-21 2:59 ` Zhang, Shenglei
2019-06-21 2:59 ` [PATCH 3/4] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull Zhang, Shenglei
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Zhang, Shenglei @ 2019-06-21 2:59 UTC (permalink / raw)
To: devel; +Cc: Liming Gao
PeiS3Lib has been deprecated since 2009 so remove it.
https://bugzilla.tianocore.org/show_bug.cgi?id=1299
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
.../Library/PeiS3Lib/PeiS3Lib.c | 45 -------------------
.../IntelFrameworkModulePkg.dsc | 1 -
.../Library/PeiS3Lib/PeiS3Lib.inf | 44 ------------------
.../Library/PeiS3Lib/PeiS3Lib.uni | 18 --------
4 files changed, 108 deletions(-)
delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni
diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
deleted file mode 100644
index a8583498afc1..000000000000
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/** @file
- This library provides API to invoke the S3 resume vector in the APCI Table in S3 resume mode.
-
- 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/PeiServicesLib.h>
-#include <Library/PeiServicesTablePointerLib.h>
-#include <Library/DebugLib.h>
-
-#include <Ppi/S3Resume.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
- )
-{
- EFI_STATUS Status;
- EFI_PEI_S3_RESUME_PPI *S3Resume;
-
- Status = PeiServicesLocatePpi (
- &gEfiPeiS3ResumePpiGuid,
- 0,
- NULL,
- (VOID **)&S3Resume
- );
- ASSERT_EFI_ERROR (Status);
-
- return S3Resume->S3RestoreConfig ((EFI_PEI_SERVICES **) GetPeiServicesTablePointer());
-}
-
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index c56c0f88bb78..524e7c54e323 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -114,7 +114,6 @@ [PcdsFixedAtBuild]
[Components]
IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
- IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
deleted file mode 100644
index c368db98068f..000000000000
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
+++ /dev/null
@@ -1,44 +0,0 @@
-## @file
-# This library provides API to invoke the S3 resume vector in the ACPI Table in S3 resume mode.
-#
-# 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 = PeiS3Lib
- MODULE_UNI_FILE = PeiS3Lib.uni
- FILE_GUID = EFB7D3A8-DEB9-4bed-B6D6-3B09BEEB835A
- 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
-#
-
-[Sources]
- PeiS3Lib.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- IntelFrameworkPkg/IntelFrameworkPkg.dec
-
-[LibraryClasses]
- PeiServicesTablePointerLib
- DebugLib
-
-[Ppis]
- gEfiPeiS3ResumePpiGuid ## CONSUMES
-
diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni
deleted file mode 100644
index 85d004e798e1..000000000000
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni
+++ /dev/null
@@ -1,18 +0,0 @@
-// /** @file
-// This library provides API to invoke the S3 resume vector in the ACPI Table in S3 resume mode.
-//
-// 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 - 2014, Intel Corporation. All rights reserved.<BR>
-//
-// SPDX-License-Identifier: BSD-2-Clause-Patent
-//
-// **/
-
-
-#string STR_MODULE_ABSTRACT #language en-US "Provides an API to invoke the S3 resume vector in the ACPI Table in S3 resume mode"
-
-#string STR_MODULE_DESCRIPTION #language en-US "This library instance is no longer used and any module using this library class should update to directly locate EFI_PEI_S3_RESUME_PPI defined in the PI 1.2 Specification."
-
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull
2019-06-21 2:59 [PATCH 0/4] Remove S3Lib and RecoveryLib Zhang, Shenglei
2019-06-21 2:59 ` [PATCH 1/4] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull Zhang, Shenglei
2019-06-21 2:59 ` [PATCH 2/4] IntelFrameworkModulePkg: Remove PeiS3Lib Zhang, Shenglei
@ 2019-06-21 2:59 ` Zhang, Shenglei
2019-06-21 3:00 ` [PATCH 4/4] IntelFrameworkModulePkg: Remove PeiRecoveryLib Zhang, Shenglei
2019-06-21 12:43 ` [edk2-devel] [PATCH 0/4] Remove S3Lib and RecoveryLib Zeng, Star
4 siblings, 0 replies; 6+ messages in thread
From: Zhang, Shenglei @ 2019-06-21 2:59 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 563fc1818531..16332cd9d0fb 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
* [PATCH 4/4] IntelFrameworkModulePkg: Remove PeiRecoveryLib
2019-06-21 2:59 [PATCH 0/4] Remove S3Lib and RecoveryLib Zhang, Shenglei
` (2 preceding siblings ...)
2019-06-21 2:59 ` [PATCH 3/4] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull Zhang, Shenglei
@ 2019-06-21 3:00 ` Zhang, Shenglei
2019-06-21 12:43 ` [edk2-devel] [PATCH 0/4] Remove S3Lib and RecoveryLib Zeng, Star
4 siblings, 0 replies; 6+ messages in thread
From: Zhang, Shenglei @ 2019-06-21 3:00 UTC (permalink / raw)
To: devel; +Cc: Liming Gao
PeiRecoveryLib has been deprecated since 2009 so remove it.
https://bugzilla.tianocore.org/show_bug.cgi?id=1299
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
.../Library/PeiRecoveryLib/PeiRecoveryLib.c | 44 ------------------
.../IntelFrameworkModulePkg.dsc | 1 -
.../Library/PeiRecoveryLib/PeiRecoveryLib.inf | 45 -------------------
.../Library/PeiRecoveryLib/PeiRecoveryLib.uni | 18 --------
4 files changed, 108 deletions(-)
delete mode 100644 IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
delete mode 100644 IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
delete mode 100644 IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.uni
diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
deleted file mode 100644
index 8072f8a3abe8..000000000000
--- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/** @file
- This Library uses Framework RecoveryModule PPI to do system recovery.
-
- 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/PeiServicesLib.h>
-#include <Library/PeiServicesTablePointerLib.h>
-#include <Library/DebugLib.h>
-
-#include <Ppi/RecoveryModule.h>
-
-/**
- Calling this function causes the system do recovery.
-
- @retval EFI_SUCESS Sucess to do recovery.
- @retval Others Fail to do recovery.
-**/
-EFI_STATUS
-EFIAPI
-PeiRecoverFirmware (
- VOID
- )
-{
- EFI_STATUS Status;
- EFI_PEI_RECOVERY_MODULE_PPI *PeiRecovery;
-
- Status = PeiServicesLocatePpi (
- &gEfiPeiRecoveryModulePpiGuid,
- 0,
- NULL,
- (VOID **)&PeiRecovery
- );
- ASSERT_EFI_ERROR (Status);
-
- return PeiRecovery->LoadRecoveryCapsule ((EFI_PEI_SERVICES **) GetPeiServicesTablePointer(), PeiRecovery);
-}
-
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 524e7c54e323..aa4ae5b8554a 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -114,7 +114,6 @@ [PcdsFixedAtBuild]
[Components]
IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
- IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
deleted file mode 100644
index 12fe957c1a57..000000000000
--- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
+++ /dev/null
@@ -1,45 +0,0 @@
-## @file
-# PEIM Recovery Library supports system recovery boot.
-#
-# 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 = PeiRecoveryLib
- MODULE_UNI_FILE = PeiRecoveryLib.uni
- FILE_GUID = C0227547-0811-4cbb-ABEA-DECD22829122
- 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
-#
-
-[Sources]
- PeiRecoveryLib.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
-
-[LibraryClasses]
- BaseLib
- PeiServicesTablePointerLib
- DebugLib
-
-[Ppis]
- gEfiPeiRecoveryModulePpiGuid ## CONSUMES
-
-
diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.uni b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.uni
deleted file mode 100644
index 1b704921c6ee..000000000000
--- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.uni
+++ /dev/null
@@ -1,18 +0,0 @@
-// /** @file
-// PEIM Recovery Library supports system recovery boot.
-//
-// 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 - 2014, Intel Corporation. All rights reserved.<BR>
-//
-// SPDX-License-Identifier: BSD-2-Clause-Patent
-//
-// **/
-
-
-#string STR_MODULE_ABSTRACT #language en-US "PEIM Recovery Library supports system recovery boot"
-
-#string STR_MODULE_DESCRIPTION #language en-US "This library instance is no longer used and any module using this library class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined in the PI 1.2 Specification."
-
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH 0/4] Remove S3Lib and RecoveryLib
2019-06-21 2:59 [PATCH 0/4] Remove S3Lib and RecoveryLib Zhang, Shenglei
` (3 preceding siblings ...)
2019-06-21 3:00 ` [PATCH 4/4] IntelFrameworkModulePkg: Remove PeiRecoveryLib Zhang, Shenglei
@ 2019-06-21 12:43 ` Zeng, Star
4 siblings, 0 replies; 6+ messages in thread
From: Zeng, Star @ 2019-06-21 12:43 UTC (permalink / raw)
To: devel@edk2.groups.io, Zhang, Shenglei
Cc: Wang, Jian J, Wu, Hao A, Ni, Ray, Gao, Liming, Zeng, Star
Removed-by: Star Zeng <star.zeng@intel.com> to the series.
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Zhang, Shenglei
> Sent: Friday, June 21, 2019 11:00 AM
> 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>; Gao, Liming
> <liming.gao@intel.com>
> Subject: [edk2-devel] [PATCH 0/4] 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.
>
> 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>
> Cc: Liming Gao <liming.gao@intel.com>
> Shenglei Zhang (4):
> MdeModulePkg: Remove S3Lib.h and PeiS3LibNull
> IntelFrameworkModulePkg: Remove PeiS3Lib
> MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull
> IntelFrameworkModulePkg: Remove PeiRecoveryLib
>
> .../Library/PeiRecoveryLib/PeiRecoveryLib.c | 44 ------------------
> .../Library/PeiS3Lib/PeiS3Lib.c | 45 -------------------
> .../PeiRecoveryLibNull/PeiRecoveryLibNull.c | 28 ------------
> .../Library/PeiS3LibNull/PeiS3LibNull.c | 29 ------------
> .../IntelFrameworkModulePkg.dsc | 2 -
> .../Library/PeiRecoveryLib/PeiRecoveryLib.inf | 45 -------------------
> .../Library/PeiRecoveryLib/PeiRecoveryLib.uni | 18 --------
> .../Library/PeiS3Lib/PeiS3Lib.inf | 44 ------------------
> .../Library/PeiS3Lib/PeiS3Lib.uni | 18 --------
> 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 -
> 18 files changed, 447 deletions(-)
> delete mode 100644
> IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
> delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
> delete mode 100644
> MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
> delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
> delete mode 100644
> IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
> delete mode 100644
> IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.uni
> delete mode 100644
> IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
> delete mode 100644
> IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni
> 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-06-21 12:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-21 2:59 [PATCH 0/4] Remove S3Lib and RecoveryLib Zhang, Shenglei
2019-06-21 2:59 ` [PATCH 1/4] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull Zhang, Shenglei
2019-06-21 2:59 ` [PATCH 2/4] IntelFrameworkModulePkg: Remove PeiS3Lib Zhang, Shenglei
2019-06-21 2:59 ` [PATCH 3/4] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull Zhang, Shenglei
2019-06-21 3:00 ` [PATCH 4/4] IntelFrameworkModulePkg: Remove PeiRecoveryLib Zhang, Shenglei
2019-06-21 12:43 ` [edk2-devel] [PATCH 0/4] Remove S3Lib and RecoveryLib Zeng, Star
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox