Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com> > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Oram, > Isaac W > Sent: Tuesday, January 11, 2022 6:20 PM > To: devel@edk2.groups.io > Cc: Oram, Isaac W <isaac.w.o...@intel.com>; Chaganty, Rangasai V > <rangasai.v.chaga...@intel.com>; Gao, Liming <gaolim...@byosoft.com.cn> > Subject: [edk2-devel][edk2-platforms][PATCH V1 07/27] S3FeaturePkg: Use > MinPlatformPkg build include files > > Use the MinPlatformPkg common core build files to build libraries needed by > this feature. > > Cc: Sai Chaganty <rangasai.v.chaga...@intel.com> > Cc: Liming Gao <gaolim...@byosoft.com.cn> > > Signed-off-by: Isaac Oram <isaac.w.o...@intel.com> > --- > Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf > | 2 +- > Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc | > 72 ++------------------ > Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc | 18 > +++++ > 3 files changed, 26 insertions(+), 66 deletions(-) > > diff --git > a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fd > f > b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fd > f > index 34caf3dacc..fdd16a4e03 100644 > --- > a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fd > f > +++ > b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fd > f > @@ -7,4 +7,4 @@ > # > ## > > - INF S3FeaturePkg/S3Pei/S3Pei.inf > +INF S3FeaturePkg/S3Pei/S3Pei.inf > diff --git > a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc > b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc > index f94bd2b431..cc34e78507 100644 > --- > a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc > +++ > b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc > @@ -18,12 +18,12 @@ > # > > ########################################################## > ###################### > [Defines] > -!ifndef $(PEI_ARCH) > - !error "PEI_ARCH must be specified to build this feature!" > -!endif > -!ifndef $(DXE_ARCH) > - !error "DXE_ARCH must be specified to build this feature!" > -!endif > + !ifndef $(PEI_ARCH) > + !error "PEI_ARCH must be specified to build this feature!" > + !endif > + !ifndef $(DXE_ARCH) > + !error "DXE_ARCH must be specified to build this feature!" > + !endif > > > ########################################################## > ###################### > # > @@ -31,34 +31,7 @@ > # > > ########################################################## > ###################### > > -!include MdePkg/MdeLibs.dsc.inc > - > -[LibraryClasses] > - ####################################### > - # Edk2 Packages > - ####################################### > - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > - > BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibR > epStr.inf > - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > - IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf > - PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf > - PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf > - > PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibP > ci.inf > - > -[LibraryClasses.common.PEI_CORE,LibraryClasses.common.PEIM] > - ####################################### > - # Edk2 Packages > - ####################################### > - HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > - > MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemory > AllocationLib.inf > - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > - PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf > - PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > - > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/P > eiServicesTablePointerLibIdt.inf > - > - ####################################### > - # Silicon Initialization Package > - ####################################### > +[LibraryClasses.common.PEIM] > > SmmAccessLib|IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAccessLi > b/PeiSmmAccessLib.inf > > > ########################################################## > ###################### > @@ -92,34 +65,3 @@ > > # Add components here that should be included in the package build. > S3FeaturePkg/S3Pei/S3Pei.inf > - > -# > -# Feature DXE Components > -# > - > -# @todo: Change below line to [Components.$(DXE_ARCH)] after > https://bugzilla.tianocore.org/show_bug.cgi?id=2308 > -# is completed. > -[Components.X64] > - ##################################### > - # S3 Feature Package > - ##################################### > - > - # Add library instances here that are not included in package components > and should be tested > - # in the package build. > - > - # Add components here that should be included in the package build. > - > - > ########################################################## > ######################################### > -# > -# BuildOptions Section - Define the module specific tool chain flags that > should be used as > -# the default flags for a module. These flags are > appended to any > -# standard flags that are defined by the build > process. They can > be > -# applied for any modules or only those modules with > the > specific > -# module style (EDK or EDKII) specified in > [Components] section. > -# > -# For advanced features, it is recommended to enable > [BuildOptions] in > -# the applicable INF file so it does not affect the > whole board > package > -# build when this DSC file is active. > -# > - > ########################################################## > ######################################### > -[BuildOptions] > diff --git > a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc > b/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc > index 28ee49d429..e16a1f8d00 100644 > --- a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc > +++ b/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc > @@ -24,6 +24,24 @@ > PEI_ARCH = IA32 > DXE_ARCH = X64 > > +[Packages] > + MinPlatformPkg/MinPlatformPkg.dec > + > +[PcdsFeatureFlag] > + # > + # PCD needed for MinPlatform build includes > + # > + gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable > |FALSE > + gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable > |FALSE > + gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable > |FALSE > + > +# > +# Include common libraries > +# > +!include MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc > +!include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc > +!include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc > + > # > # This package always builds the feature. > # > -- > 2.27.0.windows.1 > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85631): https://edk2.groups.io/g/devel/message/85631 Mute This Topic: https://groups.io/mt/88365335/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
