From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com []) by mx.groups.io with SMTP id smtpd.web10.2401.1573615709373949821 for ; Tue, 12 Nov 2019 19:29:09 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.a.kubacki@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Nov 2019 19:29:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,299,1569308400"; d="scan'208";a="379090911" Received: from makuback-desk1.amr.corp.intel.com ([10.7.159.162]) by orsmga005.jf.intel.com with ESMTP; 12 Nov 2019 19:29:09 -0800 From: "Kubacki, Michael A" To: devel@edk2.groups.io Cc: Sai Chaganty , Liming Gao Subject: [edk2-platforms][PATCH V1 13/49] AdvancedFeaturePkg: Remove the S3 feature Date: Tue, 12 Nov 2019 19:27:39 -0800 Message-Id: <20191113032816.4056-14-michael.a.kubacki@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20191113032816.4056-1-michael.a.kubacki@intel.com> References: <20191113032816.4056-1-michael.a.kubacki@intel.com> Removes the S3 feature from AdvancedFeaturePkg. The feature does not follow the advanced feature design. A future change will add the feature back following the advanced feature design. Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Michael Kubacki --- Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 6 ---- Platform/Intel/AdvancedFeaturePkg/S3/S3Pei.inf | 31 ----------------- Platform/Intel/AdvancedFeaturePkg/S3/S3Pei.c | 36 -------------------- 3 files changed, 73 deletions(-) diff --git a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc index b83e72b48c..885b84e2df 100644 --- a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc +++ b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc @@ -102,11 +102,6 @@ MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - ####################################### - # Silicon Initialization Package - ####################################### - SmmAccessLib|IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAccessLib/PeiSmmAccessLib.inf - [LibraryClasses.common.DXE_CORE,LibraryClasses.common.DXE_SMM_DRIVER,LibraryClasses.common.SMM_CORE,LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.DXE_RUNTIME_DRIVER,LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION] ####################################### # Edk2 Packages @@ -158,7 +153,6 @@ AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf - AdvancedFeaturePkg/S3/S3Pei.inf AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf [BuildOptions] diff --git a/Platform/Intel/AdvancedFeaturePkg/S3/S3Pei.inf b/Platform/Intel/AdvancedFeaturePkg/S3/S3Pei.inf deleted file mode 100644 index 847edd20c0..0000000000 --- a/Platform/Intel/AdvancedFeaturePkg/S3/S3Pei.inf +++ /dev/null @@ -1,31 +0,0 @@ -### @file -# Component information file for the S3 PEI module. -# -# Copyright (c) 2019, Intel Corporation. All rights reserved.
-# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -### - -[Defines] - INF_VERSION = 0x00010017 - BASE_NAME = S3Pei - FILE_GUID = 8683EFB2-FDE1-4AFF-B2DB-E96449FDD4E9 - VERSION_STRING = 1.0 - MODULE_TYPE = PEIM - ENTRY_POINT = S3PeiEntryPoint - -[LibraryClasses] - PeimEntryPoint - PeiServicesLib - SmmAccessLib - -[Packages] - MdePkg/MdePkg.dec - IntelSiliconPkg/IntelSiliconPkg.dec - -[Sources] - S3Pei.c - -[Depex] - gEfiPeiMemoryDiscoveredPpiGuid diff --git a/Platform/Intel/AdvancedFeaturePkg/S3/S3Pei.c b/Platform/Intel/AdvancedFeaturePkg/S3/S3Pei.c deleted file mode 100644 index b0aaa04962..0000000000 --- a/Platform/Intel/AdvancedFeaturePkg/S3/S3Pei.c +++ /dev/null @@ -1,36 +0,0 @@ -/** @file - Source code file for S3 PEI module - -Copyright (c) 2019, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include -#include - -/** - S3 PEI module entry point - - @param[in] FileHandle Not used. - @param[in] PeiServices General purpose services available to every PEIM. - - @retval EFI_SUCCESS The function completes successfully - @retval EFI_OUT_OF_RESOURCES Insufficient resources to create database -**/ -EFI_STATUS -EFIAPI -S3PeiEntryPoint ( - IN EFI_PEI_FILE_HANDLE FileHandle, - IN CONST EFI_PEI_SERVICES **PeiServices - ) -{ - EFI_STATUS Status; - - // - // Install EFI_PEI_MM_ACCESS_PPI for S3 resume case - // - Status = PeiInstallSmmAccessPpi (); - - return Status; -} -- 2.16.2.windows.1