Bläddra i källkod

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>
Dandan Bi 5 år sedan
förälder
incheckning
1df91bb772

+ 14 - 36
QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c

@@ -2,7 +2,7 @@
 Install Platform EFI_PEI_RECOVERY_MODULE_PPI and Implementation of
 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
 
@@ -197,25 +197,13 @@ Returns:
   //
   if (ProviderAvailable) {
     RecoveryCapsuleSize = 0;
-    if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
-      Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo (
-                                      PeiServices,
-                                      DeviceRecoveryModule,
-                                      0,
-                                      &RecoveryCapsuleSize,
-                                      &DeviceId
-                                      );
-    } else {
-      Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo (
-                  PeiServices,
-                  DeviceRecoveryModule,
-                  1,
-                  &RecoveryCapsuleSize,
-                  &DeviceId
-                  );
-
-
-  }
+    Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo (
+                PeiServices,
+                DeviceRecoveryModule,
+                1,
+                &RecoveryCapsuleSize,
+                &DeviceId
+                );
 
     if (EFI_ERROR (Status)) {
       return Status;
@@ -239,22 +227,12 @@ Returns:
     ASSERT (Address);
 
     Buffer = (UINT8 *) (UINTN) Address;
-    if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
-      Status = DeviceRecoveryModule->LoadRecoveryCapsule (
-                                      PeiServices,
-                                      DeviceRecoveryModule,
-                                      0,
-                                      Buffer
-                                      );
-     } else {
-       Status = DeviceRecoveryModule->LoadRecoveryCapsule (
-                                        PeiServices,
-                                        DeviceRecoveryModule,
-                                        1,
-                                        Buffer
-                                        );
-
-     }
+    Status = DeviceRecoveryModule->LoadRecoveryCapsule (
+                                     PeiServices,
+                                     DeviceRecoveryModule,
+                                     1,
+                                     Buffer
+                                     );
 
     DEBUG ((EFI_D_INFO | EFI_D_LOAD, "LoadRecoveryCapsule Returns: %r\n", Status));
 

+ 1 - 2
QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf

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