QuarkPlatformPkg: Remove PcdFrameworkCompatibilitySupport usage

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: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Kelly Steele <kelly.steele@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Dandan Bi 2019-04-28 21:40:13 +08:00 committed by Liming Gao
parent 059cf575eb
commit 1df91bb772
2 changed files with 15 additions and 38 deletions

View File

@ -2,7 +2,7 @@
Install Platform EFI_PEI_RECOVERY_MODULE_PPI and Implementation of Install Platform EFI_PEI_RECOVERY_MODULE_PPI and Implementation of
EFI_PEI_LOAD_RECOVERY_CAPSULE service. EFI_PEI_LOAD_RECOVERY_CAPSULE service.
Copyright (c) 2013-2016 Intel Corporation. Copyright (c) 2013-2019 Intel Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -197,15 +197,6 @@ Returns:
// //
if (ProviderAvailable) { if (ProviderAvailable) {
RecoveryCapsuleSize = 0; RecoveryCapsuleSize = 0;
if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo (
PeiServices,
DeviceRecoveryModule,
0,
&RecoveryCapsuleSize,
&DeviceId
);
} else {
Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo ( Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo (
PeiServices, PeiServices,
DeviceRecoveryModule, DeviceRecoveryModule,
@ -214,9 +205,6 @@ Returns:
&DeviceId &DeviceId
); );
}
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }
@ -239,14 +227,6 @@ Returns:
ASSERT (Address); ASSERT (Address);
Buffer = (UINT8 *) (UINTN) Address; Buffer = (UINT8 *) (UINTN) Address;
if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
Status = DeviceRecoveryModule->LoadRecoveryCapsule (
PeiServices,
DeviceRecoveryModule,
0,
Buffer
);
} else {
Status = DeviceRecoveryModule->LoadRecoveryCapsule ( Status = DeviceRecoveryModule->LoadRecoveryCapsule (
PeiServices, PeiServices,
DeviceRecoveryModule, DeviceRecoveryModule,
@ -254,8 +234,6 @@ Returns:
Buffer Buffer
); );
}
DEBUG ((EFI_D_INFO | EFI_D_LOAD, "LoadRecoveryCapsule Returns: %r\n", Status)); DEBUG ((EFI_D_INFO | EFI_D_LOAD, "LoadRecoveryCapsule Returns: %r\n", Status));
if (Status == EFI_DEVICE_ERROR) { if (Status == EFI_DEVICE_ERROR) {

View File

@ -36,7 +36,7 @@
# memory specific stuff like build memory map, build # memory specific stuff like build memory map, build
# resource description hob for DXE phase,etc. # resource description hob for DXE phase,etc.
# Bootmode.c - Detect boot mode. # Bootmode.c - Detect boot mode.
# Copyright (c) 2013 - 2016 Intel Corporation. # Copyright (c) 2013 - 2019 Intel Corporation.
# #
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
@ -140,7 +140,6 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnDataCD gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnDataCD
gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnFatFloppyDisk gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnFatFloppyDisk
gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnIdeDisk gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnIdeDisk
gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport
gQuarkPlatformTokenSpaceGuid.WaitIfResetDueToError gQuarkPlatformTokenSpaceGuid.WaitIfResetDueToError
[Pcd] [Pcd]