Parcourir la source

IntelFrameworkModulePkg: 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: 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 il y a 5 ans
Parent
commit
9feffce9c6

+ 1 - 9
IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c

@@ -2,7 +2,7 @@
   This is an implementation of the ACPI S3 Save protocol.  This is defined in
   S3 boot path specification 0.9.
 
-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
 
@@ -140,10 +140,6 @@ S3Ready (
   }
   AlreadyEntered = TRUE;
 
-  if (FeaturePcdGet(PcdFrameworkCompatibilitySupport)) {
-    S3ReadyThunkPlatform ();
-  }
-
   return EFI_SUCCESS;
 }
 
@@ -182,10 +178,6 @@ InstallAcpiS3Save (
     mLegacyRegionSize = 0x100;
   }
 
-  if (FeaturePcdGet(PcdFrameworkCompatibilitySupport)) {
-    InstallAcpiS3SaveThunk ();
-  }
-
   Status = gBS->InstallProtocolInterface (
                   &ImageHandle,
                   &gEfiAcpiS3SaveProtocolGuid,

+ 1 - 2
IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf

@@ -1,7 +1,7 @@
 ## @file
 # AcpiS3Save module installs ACPI S3 Save protocol to prepare S3 boot data.
 #
-# 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
 #
@@ -58,7 +58,6 @@
 
 [FeaturePcd]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformCsmSupport          ## CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport          ## CONSUMES
 
 [Pcd]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize    ## SOMETIMES_CONSUMES