From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: dandan.bi@intel.com) Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:37 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Apr 2019 19:16:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631921" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:36 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Liming Gao Subject: [patch 03/11] IntelFrameworkModulePkg: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:15:59 +0800 Message-Id: <20190429021607.11304-4-dandan.bi@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> 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 Signed-off-by: Dandan Bi --- .../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.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
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.
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
# # 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