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>

diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c b/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c
index f6a076f757ecdfd32c95a0bf6fce824b8c30f039..67299a68b7d333959477afcf7f20a7fa0bcb4c69 100644 (file)
--- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c
+++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c
@@ -2,7 +2,7 @@
 Install Platform EFI_PEI_RECOVERY_MODULE_PPI and Implementation of\r
 EFI_PEI_LOAD_RECOVERY_CAPSULE service.\r
 \r
-Copyright (c) 2013-2016 Intel Corporation.\r
+Copyright (c) 2013-2019 Intel Corporation.\r
 \r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -197,25 +197,13 @@ Returns:
   //\r
   if (ProviderAvailable) {\r
     RecoveryCapsuleSize = 0;\r
-    if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
-      Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo (\r
-                                      PeiServices,\r
-                                      DeviceRecoveryModule,\r
-                                      0,\r
-                                      &RecoveryCapsuleSize,\r
-                                      &DeviceId\r
-                                      );\r
-    } else {\r
-      Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo (\r
-                  PeiServices,\r
-                  DeviceRecoveryModule,\r
-                  1,\r
-                  &RecoveryCapsuleSize,\r
-                  &DeviceId\r
-                  );\r
-\r
-\r
-  }\r
+    Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo (\r
+                PeiServices,\r
+                DeviceRecoveryModule,\r
+                1,\r
+                &RecoveryCapsuleSize,\r
+                &DeviceId\r
+                );\r
 \r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
@@ -239,22 +227,12 @@ Returns:
     ASSERT (Address);\r
 \r
     Buffer = (UINT8 *) (UINTN) Address;\r
-    if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
-      Status = DeviceRecoveryModule->LoadRecoveryCapsule (\r
-                                      PeiServices,\r
-                                      DeviceRecoveryModule,\r
-                                      0,\r
-                                      Buffer\r
-                                      );\r
-     } else {\r
-       Status = DeviceRecoveryModule->LoadRecoveryCapsule (\r
-                                        PeiServices,\r
-                                        DeviceRecoveryModule,\r
-                                        1,\r
-                                        Buffer\r
-                                        );\r
-\r
-     }\r
+    Status = DeviceRecoveryModule->LoadRecoveryCapsule (\r
+                                     PeiServices,\r
+                                     DeviceRecoveryModule,\r
+                                     1,\r
+                                     Buffer\r
+                                     );\r
 \r
     DEBUG ((EFI_D_INFO | EFI_D_LOAD, "LoadRecoveryCapsule Returns: %r\n", Status));\r
 \r

diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
index 617d681d7746f205601d307bd23bdd0dcf90e36b..df8b0dd3bd1e11214ecd3bf2f686961b87656606 100644 (file)
--- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
+++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
@@ -36,7 +36,7 @@
 #     memory specific stuff like build memory map, build\r
 #     resource description hob for DXE phase,etc.\r
 #  Bootmode.c - Detect boot mode.\r
-# Copyright (c) 2013 - 2016 Intel Corporation.\r
+# Copyright (c) 2013 - 2019 Intel Corporation.\r
 #\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
@@ -140,7 +140,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnDataCD\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnFatFloppyDisk\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnIdeDisk\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport\r
   gQuarkPlatformTokenSpaceGuid.WaitIfResetDueToError\r
 \r
 [Pcd]\r