Reviewed-by: Hao Wu <hao.a...@intel.com> Best Regards, Hao Wu
> -----Original Message----- > From: Bi, Dandan > Sent: Monday, April 29, 2019 10:16 AM > To: devel@edk2.groups.io > Cc: Wu, Hao A; Gao, Liming > Subject: [patch 05/11] MdeModulePkg/CdExpress: Remove > PcdFrameworkCompatibilitySupport usage > > 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: Hao Wu <hao.a...@intel.com> > Cc: Liming Gao <liming....@intel.com> > Signed-off-by: Dandan Bi <dandan...@intel.com> > --- > .../Universal/Disk/CdExpressPei/CdExpressPei.inf | 5 +---- > .../Universal/Disk/CdExpressPei/PeiCdExpress.c | 10 +--------- > 2 files changed, 2 insertions(+), 13 deletions(-) > > diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf > b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf > index 11ab49b33b..184036bfb9 100644 > --- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf > +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf > @@ -3,11 +3,11 @@ > # > # This module reads data from CDROM device by all installed block IO ppi and > # finds whether there is Recovery data in the device. If it finds recovery > # data, it will install Device Recovery Module PPI. > # > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR> > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > ## > > @@ -56,13 +56,10 @@ > ## NOTIFY > ## CONSUMES > gEfiPeiVirtualBlockIo2PpiGuid > gEfiPeiDeviceRecoveryModulePpiGuid ## PRODUCES > > -[FeaturePcd] > - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## > CONSUMES > - > [Pcd] > gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName ## > CONSUMES > > [Depex] > gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid > diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c > b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c > index b029c54729..fd34f07eec 100644 > --- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c > +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c > @@ -1,9 +1,9 @@ > /** @file > Source file for CD recovery PEIM > > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> > +Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR> > > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > > @@ -585,14 +585,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_CD_EXPRESS_PRIVATE_DATA_FROM_THIS (This); > @@ -645,14 +641,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_CD_EXPRESS_PRIVATE_DATA_FROM_THIS (This); > -- > 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40009): https://edk2.groups.io/g/devel/message/40009 Mute This Topic: https://groups.io/mt/31378999/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
