From: "Dandan Bi" <dandan.bi@intel.com>
To: devel@edk2.groups.io
Cc: Jiewen Yao <jiewen.yao@intel.com>, Chao
Subject: [patch 08/11] SignedCapsulePkg: Remove PcdFrameworkCompatibilitySupport usage
Date: Mon, 29 Apr 2019 10:16:04 +0800 [thread overview]
Message-ID: <20190429021607.11304-9-dandan.bi@intel.com> (raw)
In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
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 <jiewen.yao@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
.../Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c | 6 +++---
.../RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf | 5 +----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
index 29a2cc520c..eda3cc5420 100644
--- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
+++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
@@ -7,11 +7,11 @@
buffer overflow, integer overflow.
ProcessRecoveryCapsule(), ProcessFmpCapsuleImage(), ProcessRecoveryImage(),
ValidateFmpCapsule() will receive untrusted input and do basic validation.
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
//
@@ -764,11 +764,11 @@ LoadRecoveryCapsule (
for (CapsuleInstance = 1; CapsuleInstance <= NumberRecoveryCapsules; CapsuleInstance++) {
CapsuleSize = 0;
Status = DeviceRecoveryPpi->GetRecoveryCapsuleInfo (
(EFI_PEI_SERVICES **)PeiServices,
DeviceRecoveryPpi,
- FeaturePcdGet(PcdFrameworkCompatibilitySupport) ? 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 = DeviceRecoveryPpi->LoadRecoveryCapsule (
(EFI_PEI_SERVICES **)PeiServices,
DeviceRecoveryPpi,
- FeaturePcdGet(PcdFrameworkCompatibilitySupport) ? 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/RecoveryModuleLoadPei.inf b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf
index f0f5d21a7a..431b0e1802 100644
--- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf
+++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf
@@ -1,11 +1,11 @@
## @file
# Recovery module.
#
# Load Recovery capsule and install FV.
#
-# Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
@@ -54,13 +54,10 @@
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid ## CONSUMES
gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid ## CONSUMES
-[FeaturePcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES
-
[depex]
gEfiPeiBootInRecoveryModePpiGuid
[UserExtensions.TianoCore."ExtraFiles"]
RecoveryModuleLoadPeiExtra.uni
--
2.18.0.windows.1
next prev parent reply other threads:[~2019-04-29 2:16 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-29 2:15 [patch 00/11] Remove PcdFrameworkCompatibilitySupport Dandan Bi
2019-04-29 2:15 ` [patch 01/11] BaseTools/VfrCompile: Remove framework VFR support Dandan Bi
2019-05-07 5:52 ` [edk2-devel] " Bob Feng
2019-05-07 6:00 ` Liming Gao
2019-04-29 2:15 ` [patch 02/11] FatPkg/FatPei: Remove PcdFrameworkCompatibilitySupport usage Dandan Bi
2019-05-05 3:25 ` [edk2-devel] " Ni, Ray
2019-04-29 2:15 ` [patch 03/11] IntelFrameworkModulePkg: " Dandan Bi
2019-05-07 5:59 ` Liming Gao
2019-04-29 2:16 ` [patch 04/11] MdeModulePkg/Core: " Dandan Bi
2019-05-06 1:22 ` [edk2-devel] " Wu, Hao A
2019-05-06 2:48 ` Dandan Bi
2019-05-06 2:54 ` Wu, Hao A
2019-05-07 7:08 ` Dandan Bi
2019-05-08 8:23 ` Liming Gao
2019-04-29 2:16 ` [patch 05/11] MdeModulePkg/CdExpress: " Dandan Bi
2019-05-06 1:05 ` Wu, Hao A
2019-04-29 2:16 ` [patch 06/11] MdeModulePkg/Setup: " Dandan Bi
2019-05-07 6:13 ` Dong, Eric
2019-04-29 2:16 ` [patch 07/11] QuarkPlatformPkg: " Dandan Bi
2019-05-07 5:58 ` [edk2-devel] " Liming Gao
2019-04-29 2:16 ` Dandan Bi [this message]
2019-04-29 2:16 ` [patch 09/11] UefiCpuPkg: " Dandan Bi
2019-04-29 15:15 ` Laszlo Ersek
2019-04-29 2:16 ` [patch 10/11] Vlv2TbltDevicePkg: " Dandan Bi
2019-05-07 8:35 ` Sun, Zailiang
2019-04-29 2:16 ` [patch 11/11] MdeModulePkg: Remove PcdFrameworkCompatibilitySupport Dandan Bi
2019-05-06 1:25 ` Wu, Hao A
[not found] ` <1599D055711F0B7C.4588@groups.io>
[not found] ` <3C0D5C461C9E904E8F62152F6274C0BB40BD01BF@SHSMSX104.ccr.corp.intel.com>
2019-05-07 6:02 ` [edk2-devel] [patch 08/11] SignedCapsulePkg: Remove PcdFrameworkCompatibilitySupport usage Yao, Jiewen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190429021607.11304-9-dandan.bi@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox