From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: dandan.bi@intel.com) Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:34 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Apr 2019 19:16:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631903" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:34 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Ray Ni Subject: [patch 02/11] FatPkg/FatPei: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:15:58 +0800 Message-Id: <20190429021607.11304-3-dandan.bi@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464 Currently Framework compatibility is not needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD firstly. Cc: Ray Ni Signed-off-by: Dandan Bi --- FatPkg/FatPei/FatLiteApi.c | 10 +--------- FatPkg/FatPei/FatPei.inf | 4 ---- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/FatPkg/FatPei/FatLiteApi.c b/FatPkg/FatPei/FatLiteApi.c index 0bf6ddae6a..b9f883b9e0 100644 --- a/FatPkg/FatPei/FatLiteApi.c +++ b/FatPkg/FatPei/FatLiteApi.c @@ -1,9 +1,9 @@ /** @file FAT recovery PEIM entry point, Ppi Functions and FAT Api functions. -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -429,14 +429,10 @@ GetRecoveryCapsuleInfo ( if (EFI_ERROR (Status)) { return Status; } - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - CapsuleInstance = CapsuleInstance + 1; - } - if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) { return EFI_NOT_FOUND; } PrivateData = PEI_FAT_PRIVATE_DATA_FROM_THIS (This); @@ -557,14 +553,10 @@ LoadRecoveryCapsule ( if (EFI_ERROR (Status)) { return Status; } - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - CapsuleInstance = CapsuleInstance + 1; - } - if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) { return EFI_NOT_FOUND; } PrivateData = PEI_FAT_PRIVATE_DATA_FROM_THIS (This); diff --git a/FatPkg/FatPei/FatPei.inf b/FatPkg/FatPei/FatPei.inf index b554aae040..d3466db9bf 100644 --- a/FatPkg/FatPei/FatPei.inf +++ b/FatPkg/FatPei/FatPei.inf @@ -63,14 +63,10 @@ [Ppis] gEfiPeiVirtualBlockIoPpiGuid ## SOMETIMES_CONSUMES PPI_NOTIFY gEfiPeiVirtualBlockIo2PpiGuid ## SOMETIMES_CONSUMES PPI_NOTIFY gEfiPeiDeviceRecoveryModulePpiGuid ## SOMETIMES_PRODUCES - -[FeaturePcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES - [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName ## CONSUMES [Depex] gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid -- 2.18.0.windows.1