tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

SignedCapsulePkg: Remove PcdFrameworkCompatibilitySupport usage

Browse Source 
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>
Reviewed-by: Jiewen.yao@intel.com
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>
This commit is contained in:
Dandan Bi 2019-04-28 21:41:24 +08:00 committed by Liming Gao
parent 1df91bb772
commit 868f139b08
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
View File

@ -9,7 +9,7 @@
ProcessRecoveryCapsule(), ProcessFmpCapsuleImage(), ProcessRecoveryImage(), ProcessRecoveryCapsule(), ProcessFmpCapsuleImage(), ProcessRecoveryImage(),
ValidateFmpCapsule() will receive untrusted input and do basic validation. 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 SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@ -766,7 +766,7 @@ LoadRecoveryCapsule (
Status = DeviceRecoveryPpi->GetRecoveryCapsuleInfo ( Status = DeviceRecoveryPpi->GetRecoveryCapsuleInfo (
(EFI_PEI_SERVICES **)PeiServices, (EFI_PEI_SERVICES **)PeiServices,
DeviceRecoveryPpi, DeviceRecoveryPpi,
FeaturePcdGet(PcdFrameworkCompatibilitySupport) ? CapsuleInstance - 1 : CapsuleInstance, CapsuleInstance,
&CapsuleSize, &CapsuleSize,
&CapsuleType &CapsuleType
); );
@ -783,7 +783,7 @@ LoadRecoveryCapsule (
Status = DeviceRecoveryPpi->LoadRecoveryCapsule ( Status = DeviceRecoveryPpi->LoadRecoveryCapsule (
(EFI_PEI_SERVICES **)PeiServices, (EFI_PEI_SERVICES **)PeiServices,
DeviceRecoveryPpi, DeviceRecoveryPpi,
FeaturePcdGet(PcdFrameworkCompatibilitySupport) ? CapsuleInstance - 1 : CapsuleInstance, CapsuleInstance,
CapsuleBuffer CapsuleBuffer
); );
DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - LoadRecoveryCapsule (%d) - %r\n", CapsuleInstance, Status)); DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - LoadRecoveryCapsule (%d) - %r\n", CapsuleInstance, Status));

5
SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf
View File

@ -3,7 +3,7 @@
# #
# Load Recovery capsule and install FV. # 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 # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
@ -56,9 +56,6 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid ## CONSUMES
gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid ## CONSUMES gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid ## CONSUMES
[FeaturePcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES
[depex] [depex]
gEfiPeiBootInRecoveryModePpiGuid gEfiPeiBootInRecoveryModePpiGuid