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>

diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
index b5f8131f98599a8598ee20e4fdeddc31e327a81a..366ada935d066c8f183d9cad7ce0b747a9c4e636 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
@@ -2,7 +2,7 @@
   This is an implementation of the ACPI S3 Save protocol.  This is defined in\r
   S3 boot path specification 0.9.\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
@@ -140,10 +140,6 @@ S3Ready (
   }\r
   AlreadyEntered = TRUE;\r
 \r
-  if (FeaturePcdGet(PcdFrameworkCompatibilitySupport)) {\r
-    S3ReadyThunkPlatform ();\r
-  }\r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -182,10 +178,6 @@ InstallAcpiS3Save (
     mLegacyRegionSize = 0x100;\r
   }\r
 \r
-  if (FeaturePcdGet(PcdFrameworkCompatibilitySupport)) {\r
-    InstallAcpiS3SaveThunk ();\r
-  }\r
-\r
   Status = gBS->InstallProtocolInterface (\r
                   &ImageHandle,\r
                   &gEfiAcpiS3SaveProtocolGuid,\r

diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
index 2e4f0868d2f3de3f41cb30f00628dfc9ed9dc48f..0cfcb8ce53432bba8ce3fcf9f741a9a0bd58f524 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # AcpiS3Save module installs ACPI S3 Save protocol to prepare S3 boot data.\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,7 +58,6 @@
 \r
 [FeaturePcd]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformCsmSupport          ## CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport          ## CONSUMES\r
 \r
 [Pcd]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize    ## SOMETIMES_CONSUMES\r