From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: shenglei.zhang@intel.com) Received: from mga09.intel.com (mga09.intel.com []) by groups.io with SMTP; Thu, 20 Jun 2019 20:00:12 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jun 2019 20:00:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,398,1557212400"; d="scan'208";a="358739700" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by fmsmga005.fm.intel.com with ESMTP; 20 Jun 2019 20:00:10 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Ray Ni , Star Zeng , Shenglei Subject: [PATCH 3/4] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull Date: Fri, 21 Jun 2019 10:59:59 +0800 Message-Id: <20190621030000.12716-4-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20190621030000.12716-1-shenglei.zhang@intel.com> References: <20190621030000.12716-1-shenglei.zhang@intel.com> 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 Cc: Hao A Wu Cc: Ray Ni Cc: Star Zeng Signed-off-by: Shenglei Zhang -SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ -#include -#include - -/** - 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 #include #include -#include #include #include #include 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.
-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.
-# 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.
-// -// 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