Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Kubacki, Michael A
Sent: Tuesday, November 12, 2019 7:28 PM
To: devel@edk2.groups.io
Cc: Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [edk2-devel] [edk2-platforms][PATCH V1 13/49] AdvancedFeaturePkg: Remove the S3 feature
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 <rangasai.v.chaganty@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Michael Kubacki <michael.a.kubacki@intel.com>
---
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.<BR> -# -# 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.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#include <Library/PeiServicesLib.h>
-#include <Library/SmmAccessLib.h>
-
-/**
- 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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#50750): https://edk2.groups.io/g/devel/message/50750
Mute This Topic: https://groups.io/mt/55160727/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-