QuarkPlatformPkg: Remove PcdFrameworkCompatibilitySupport usage

[mirror_edk2.git] / QuarkPlatformPkg / Platform / Pei / PlatformInit / Generic / Recovery.c

diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c b/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c
index ea67ba9d63aab939f9cdcdfb850446ca4fb4e8d0..67299a68b7d333959477afcf7f20a7fa0bcb4c69 100644 (file)
--- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c
+++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c
@@ -2,15 +2,9 @@
 Install Platform EFI_PEI_RECOVERY_MODULE_PPI and Implementation of\r
 EFI_PEI_LOAD_RECOVERY_CAPSULE service.\r
 \r
-Copyright (c) 2013 Intel Corporation.\r
+Copyright (c) 2013-2019 Intel Corporation.\r
 \r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -137,26 +131,21 @@ Returns:
   UINTN                                 NumberRecoveryCapsules;\r
   UINTN                                 RecoveryCapsuleSize;\r
   EFI_GUID                              DeviceId;\r
-  BOOLEAN                               ImageFound;\r
   EFI_PHYSICAL_ADDRESS                  Address;\r
   VOID                                  *Buffer;\r
   EFI_CAPSULE_HEADER                    *CapsuleHeader;\r
   EFI_PEI_HOB_POINTERS                  Hob;\r
-  EFI_PEI_HOB_POINTERS                  HobOld;\r
   BOOLEAN                               HobUpdate;\r
   EFI_FIRMWARE_VOLUME_HEADER            *FvHeader;\r
   UINTN                                 Index;\r
-  EFI_STATUS                            AuthStatus;\r
   EFI_GUID                              mEfiCapsuleHeaderGuid = QUARK_CAPSULE_GUID;\r
 \r
   Index = 0;\r
 \r
   Status                  = EFI_SUCCESS;\r
-  AuthStatus              = EFI_SUCCESS;\r
   HobUpdate               = FALSE;\r
 \r
   ProviderAvailable       = TRUE;\r
-  ImageFound              = FALSE;\r
   NumberOfImageProviders  = 0;\r
 \r
   DeviceRecoveryModule    = NULL;\r
@@ -208,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
@@ -250,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
@@ -284,7 +251,6 @@ Returns:
     //\r
     Buffer  = (VOID *)((UINT8 *) Buffer);\r
     Status      = PeiServicesGetHobList ((VOID **)&Hob.Raw);\r
-    HobOld.Raw  = Hob.Raw;\r
     while (!END_OF_HOB_LIST (Hob)) {\r
       if (Hob.Header->HobType == EFI_HOB_TYPE_FV) {\r
         DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Hob FV Length: %x\n", Hob.FirmwareVolume->Length));\r