From nobody Mon Feb 9 05:41:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39727+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39727+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504212; cv=none; d=zoho.com; s=zohoarc; b=NFc/tJ1s0kbwfKAEkgZ4OtbCUwxA7G7HxARXIHTX+Yvs14BI6zynjKjTH8gMsLpkmdFsKbx99zFaeOvrFOlYXXt1itGx/GvTnOHn7v0DSs4Pezvixtr2pq/0CSGfCVtA0KuNyuqKEAnRRAS5iZcPE51hLTMCmbDATVMWQRTe9Sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504212; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=ocojVYJJ/FjPttXDDcMhuCgaPm0CmJqtVy0n4JDJOTE=; b=mOe655wj/zzahGkw8GGlP/GKslA90Es/4dBkVydCrWDOntwl48NcNXL2BxaFwrIsomSQHyeraAHgj5Et9KDIm1IiTRTKF0R0qQbOwXQkyRTvXXaDw5NmWtryoLan9e81TlCdKeUNRq4GhUck0IP8ap7cpGsDLKd2GLMzZE8clAE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39727+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556504212048817.0470530766747; Sun, 28 Apr 2019 19:16:52 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:51 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631987" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:50 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Jiewen Yao , Chao Subject: [edk2-devel] [patch 08/11] SignedCapsulePkg: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:16:04 +0800 Message-Id: <20190429021607.11304-9-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504211; bh=yD4Vwqe7hDiaScItlVLW7Y63fxLEhQ1whsifeMXT72c=; h=Cc:Date:From:Reply-To:Subject:To; b=HeSVB51RSHfPCWVK1hHBV6d+dLlkKibMhvT28yZBVDuxGWpAmgcWi0Yapv6YHKAvMPY 1mrLL7/D0Suu/Up85pHR3fXuOOlNKWovhuWlG03D5HDDVKkrXDaOI0upTwpZ4ZcrKzlaM V4LDW05XWotJJTaJwm60UO7Hsk4UY7jqUaE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 Currently Framework compatibility support is not needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD firstly. Cc: Jiewen Yao Cc: Chao Zhang --- .../Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c | 6 +++--- .../RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c index 29a2cc520c..eda3cc5420 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c @@ -7,11 +7,11 @@ buffer overflow, integer overflow. =20 ProcessRecoveryCapsule(), ProcessFmpCapsuleImage(), ProcessRecoveryImage= (), ValidateFmpCapsule() will receive untrusted input and do basic validatio= n. =20 -Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 // @@ -764,11 +764,11 @@ LoadRecoveryCapsule ( for (CapsuleInstance =3D 1; CapsuleInstance <=3D NumberRecoveryCapsule= s; CapsuleInstance++) { CapsuleSize =3D 0; Status =3D DeviceRecoveryPpi->GetRecoveryCapsuleInfo ( (EFI_PEI_SERVICES **)PeiServices, DeviceRecoveryPpi, - FeaturePcdGet(PcdFrameworkCompatibilit= ySupport) ? CapsuleInstance - 1 : CapsuleInstance, + CapsuleInstance, &CapsuleSize, &CapsuleType ); DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - GetRecoveryCapsuleInfo (= %d - %x) - %r\n", CapsuleInstance, CapsuleSize, Status)); if (EFI_ERROR (Status)) { @@ -781,11 +781,11 @@ LoadRecoveryCapsule ( continue; } Status =3D DeviceRecoveryPpi->LoadRecoveryCapsule ( (EFI_PEI_SERVICES **)PeiServices, DeviceRecoveryPpi, - FeaturePcdGet(PcdFrameworkCompatibilit= ySupport) ? CapsuleInstance - 1 : CapsuleInstance, + CapsuleInstance, CapsuleBuffer ); DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - LoadRecoveryCapsule (%d)= - %r\n", CapsuleInstance, Status)); if (EFI_ERROR (Status)) { FreePages (CapsuleBuffer, EFI_SIZE_TO_PAGES(CapsuleSize)); diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.inf b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryMod= uleLoadPei.inf index f0f5d21a7a..431b0e1802 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.inf +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.inf @@ -1,11 +1,11 @@ ## @file # Recovery module. # # Load Recovery capsule and install FV. # -# Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # # ## @@ -54,13 +54,10 @@ =20 [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid ## CO= NSUMES gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid ## CO= NSUMES =20 -[FeaturePcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport = ## CONSUMES - [depex] gEfiPeiBootInRecoveryModePpiGuid =20 [UserExtensions.TianoCore."ExtraFiles"] RecoveryModuleLoadPeiExtra.uni --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39727): https://edk2.groups.io/g/devel/message/39727 Mute This Topic: https://groups.io/mt/31379002/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-