[edk2-devel] [patch 03/11] IntelFrameworkModulePkg: Remove PcdFrameworkCompatibilitySupport usage

[Dandan Bi]

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....@intel.com>
Signed-off-by: Dandan Bi <dandan...@intel.com>
---
 .../Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c          | 10 +---------
 .../Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf     |  3 +--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c 
b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
index b5f8131f98..366ada935d 100644
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
@@ -1,10 +1,10 @@
 /** @file
   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
 
 **/
 
@@ -138,14 +138,10 @@ S3Ready (
   if (AlreadyEntered) {
     return EFI_SUCCESS;
   }
   AlreadyEntered = TRUE;
 
-  if (FeaturePcdGet(PcdFrameworkCompatibilitySupport)) {
-    S3ReadyThunkPlatform ();
-  }
-
   return EFI_SUCCESS;
 }
 
 /**
   The Driver Entry Point.
@@ -180,14 +176,10 @@ InstallAcpiS3Save (
     mLegacyRegionSize = 0x250;
   } else {
     mLegacyRegionSize = 0x100;
   }
 
-  if (FeaturePcdGet(PcdFrameworkCompatibilitySupport)) {
-    InstallAcpiS3SaveThunk ();
-  }
-
   Status = gBS->InstallProtocolInterface (
                   &ImageHandle,
                   &gEfiAcpiS3SaveProtocolGuid,
                   EFI_NATIVE_INTERFACE,
                   &mS3Save
diff --git 
a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf 
b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
index 2e4f0868d2..0cfcb8ce53 100644
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
@@ -1,9 +1,9 @@
 ## @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
 #
 ##
 
@@ -56,11 +56,10 @@
   ## SOMETIMES_CONSUMES
   gEdkiiVariableLockProtocolGuid
 
 [FeaturePcd]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformCsmSupport          ## 
CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport          ## 
CONSUMES
 
 [Pcd]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize    ## 
SOMETIMES_CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable                           ## 
CONSUMES
 
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#39722): https://edk2.groups.io/g/devel/message/39722
Mute This Topic: https://groups.io/mt/31378997/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-