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.wu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
index 11ab49b33ba27191a0e400f659d59859306a2aa7..184036bfb960d146d99d0892f23c9d334ac5dfa3 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
@@ -5,7 +5,7 @@
 # finds whether there is Recovery data in the device. If it finds recovery\r
 # data, it will install Device Recovery Module PPI.\r
 #\r
-# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
@@ -58,9 +58,6 @@
   gEfiPeiVirtualBlockIo2PpiGuid\r
   gEfiPeiDeviceRecoveryModulePpiGuid            ## PRODUCES\r
 \r
-[FeaturePcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport   ## CONSUMES\r
-\r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName         ## CONSUMES\r
 \r

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
index b029c547292e07b4e982047cbad6649dd14192f4..fd34f07eec49de442d4ccc0f9254ff6154ef42d3 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
@@ -1,7 +1,7 @@
 /** @file\r
   Source file for CD recovery PEIM\r
 \r
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
 \r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -587,10 +587,6 @@ GetRecoveryCapsuleInfo (
     return Status;\r
   }\r
 \r
-  if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
-    CapsuleInstance = CapsuleInstance + 1;\r
-  }\r
-\r
   if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) {\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -647,10 +643,6 @@ LoadRecoveryCapsule (
     return Status;\r
   }\r
 \r
-  if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
-    CapsuleInstance = CapsuleInstance + 1;\r
-  }\r
-\r
   if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) {\r
     return EFI_NOT_FOUND;\r
   }\r