As was described in 5933acc3cb1ac1a344a34342d0ac46d3afed929a, there was no code using AcpiS3ResumeOs() interface in S3Lib and PeiRecoverFirmware() interface in RecoveryLib. PeiS3LibNull and PeiRecoveryLibNull were deprecated, so they should be removed. https://bugzilla.tianocore.org/show_bug.cgi?id=1299
Cc: Star Zeng <star.z...@intel.com> Cc: Jian J Wang <jian.j.w...@intel.com> Cc: Ruiyu Ni <ruiyu...@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Shenglei Zhang <shenglei.zh...@intel.com> --- MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 2 - .../PeiRecoveryLibNull/PeiRecoveryLibNull.c | 34 ---------------- .../PeiRecoveryLibNull/PeiRecoveryLibNull.inf | 39 ------------------ .../PeiRecoveryLibNull/PeiRecoveryLibNull.uni | 24 ----------- .../Library/PeiS3LibNull/PeiS3LibNull.c | 35 ---------------- .../Library/PeiS3LibNull/PeiS3LibNull.inf | 40 ------------------- .../Library/PeiS3LibNull/PeiS3LibNull.uni | 24 ----------- MdeModulePkg/MdeModulePkg.dec | 10 ----- MdeModulePkg/MdeModulePkg.dsc | 2 - 9 files changed, 210 deletions(-) delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h index 9ea88a399b..bd0c967d75 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h @@ -44,8 +44,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #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> #include <Library/PerformanceLib.h> diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c deleted file mode 100644 index f39a21b711..0000000000 --- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c +++ /dev/null @@ -1,34 +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> -This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ -#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 c1cdd70162..0000000000 --- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf +++ /dev/null @@ -1,39 +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> -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -## - -[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 14385297f4..0000000000 --- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni +++ /dev/null @@ -1,24 +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> -// -// This program and the accompanying materials -// are licensed and made available under the terms and conditions of the BSD License -// which accompanies this distribution. The full text of the license may be found at -// http://opensource.org/licenses/bsd-license.php -// -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// -// **/ - - -#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/Library/PeiS3LibNull/PeiS3LibNull.c b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c deleted file mode 100644 index d0b53917f9..0000000000 --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c +++ /dev/null @@ -1,35 +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> -This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ -#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/Library/PeiS3LibNull/PeiS3LibNull.inf b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf deleted file mode 100644 index c9b7ba1d69..0000000000 --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf +++ /dev/null @@ -1,40 +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> -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -## - -[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 5a8a91a12e..0000000000 --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni +++ /dev/null @@ -1,24 +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> -// -// This program and the accompanying materials -// are licensed and made available under the terms and conditions of the BSD License -// which accompanies this distribution. The full text of the license may be found at -// http://opensource.org/licenses/bsd-license.php -// -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// -// **/ - - -#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 428eeeb670..e628bb2fb8 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -57,16 +57,6 @@ ## @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. - 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 2465d39fd7..0e7a173add 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -267,9 +267,7 @@ 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/PeiS3LibNull/PeiS3LibNull.inf MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf -- 2.18.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
