From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: ray.ni@intel.com) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Fri, 02 Aug 2019 08:14:05 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Aug 2019 08:14:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,338,1559545200"; d="scan'208";a="324597879" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga004.jf.intel.com with ESMTP; 02 Aug 2019 08:14:04 -0700 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 2 Aug 2019 08:14:03 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx117.amr.corp.intel.com (10.18.116.17) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 2 Aug 2019 08:14:03 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.112]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.139]) with mapi id 14.03.0439.000; Fri, 2 Aug 2019 23:14:02 +0800 From: "Ni, Ray" To: "Zhang, Shenglei" , "devel@edk2.groups.io" CC: "Wang, Jian J" , "Wu, Hao A" , "Zeng, Star" , "Zhang, Shenglei" Subject: Re: [PATCH 2/2] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull Thread-Topic: [PATCH 2/2] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLibNull Thread-Index: AQHVSP9obmoTmr0GMUmzWhNmboHoPqbn91nw Date: Fri, 2 Aug 2019 15:13:59 +0000 Deferred-Delivery: Fri, 2 Aug 2019 15:13:00 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C26B105@SHSMSX104.ccr.corp.intel.com> References: <20190802065527.17208-1-shenglei.zhang@intel.com> <20190802065527.17208-3-shenglei.zhang@intel.com> In-Reply-To: <20190802065527.17208-3-shenglei.zhang@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYzM5M2E0ZGItNDVlNC00NDU1LWI1ZTEtMzA1YTIwZmE2NTBkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiS3pBSnljZWxaS2R6XC9SMGxNN3hWcmkrb0p0d3ZSMXl3bHEwUCt6TXBcL0o1bXVGNUFFN0pSTkpURlwva1ozU3FjRiJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni > -----Original Message----- > From: Zhang, Shenglei > Sent: Friday, August 2, 2019 2:55 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Wu, Hao A ;= Ni, Ray ; Zeng, Star > ; Shenglei > Subject: [PATCH 2/2] MdeModulePkg: Remove RecoveryLib.h and PeiRecoveryLi= bNull >=20 > RecoveryLib.h and PeiRecoveryLibNull have been deprecated from 2009, > so remove them. > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1299 >=20 > Cc: Jian J Wang > Cc: Hao A Wu > Cc: Ray Ni > Cc: Star Zeng > Signed-off-by: Shenglei Zhang --- > .../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/PeiRecoveryLi= bNull.c > delete mode 100644 MdeModulePkg/Include/Library/RecoveryLib.h > delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLi= bNull.inf > delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLi= bNull.uni >=20 > 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 st= atus. > - > - This library instance is no longer used and module using this library > - class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI def= ined > - in PI 1.2 specification. > - > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> -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/Dx= eIplPeim/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/In= clude/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 sh= ould > - directly locate EFI_PEI_RECOVERY_MODULE_PPI, defined in the PI 1.2 spe= cification. > - > -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 p= ath. > - > - @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.i= nf > 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 de= fined > -# in PI 1.2 specification. > -# > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. > -# SPDX-License-Identifier: BSD-2-Clause-Patent > -# > -## > - > -[Defines] > - INF_VERSION =3D 0x00010005 > - BASE_NAME =3D PeiRecoveryLibNull > - MODULE_UNI_FILE =3D PeiRecoveryLibNull.uni > - FILE_GUID =3D 41789FB9-02AC-4484-BD40-A3147D7EDA2= 5 > - MODULE_TYPE =3D PEIM > - VERSION_STRING =3D 1.0 > - LIBRARY_CLASS =3D RecoveryLib|PEIM > - > -# > -# The following information is for reference only and not required by th= e build tools. > -# > -# VALID_ARCHITECTURES =3D 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.u= ni > 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 de= fined > -// 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 l= ibrary instance for PEIM module" > - > -#string STR_MODULE_DESCRIPTION #language en-US "This library in= stance is no longer used and module using this library > class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI define= d in PI 1.2 Specification." > - > diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.de= c > 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 >=20 > - ## @libraryclass Defines a set of methods related recovery mode. > - # This library class is no longer used and modules using this librar= y should > - # directly locate EFI_PEI_RECOVERY_MODULE_PPI defined in PI 1.2 spec= ification. > - RecoveryLib|Include/Library/RecoveryLib.h > - > ## @libraryclass Provides HII related functions. > HiiLib|Include/Library/HiiLib.h >=20 > diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.ds= c > index 1c4525cd588c..4320839abfb5 100644 > --- a/MdeModulePkg/MdeModulePkg.dsc > +++ b/MdeModulePkg/MdeModulePkg.dsc > @@ -282,7 +282,6 @@ [Components] > MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protoc= ol.inf > MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSec= tionExtractLib.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