Pushed as d8232e8816..025d67dccc -----Original Message----- From: Desimone, Nathaniel L <nathaniel.l.desim...@intel.com> Sent: Wednesday, January 12, 2022 6:49 PM To: Oram, Isaac W <isaac.w.o...@intel.com>; devel@edk2.groups.io Cc: Gao, Liming <gaolim...@byosoft.com.cn> Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 05/27] IpmiFeaturePkg: Fix build errors
Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com> > -----Original Message----- > From: Oram, Isaac W <isaac.w.o...@intel.com> > Sent: Tuesday, January 11, 2022 6:20 PM > To: devel@edk2.groups.io > Cc: Oram, Isaac W <isaac.w.o...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com>; Gao, Liming > <gaolim...@byosoft.com.cn> > Subject: [edk2-devel][edk2-platforms][PATCH V1 05/27] IpmiFeaturePkg: > Fix build errors > > Fix build issues with standalone build. > Switch to using MinPlatformPkg common core include for common modules. > > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Cc: Liming Gao <gaolim...@byosoft.com.cn> > > Signed-off-by: Isaac Oram <isaac.w.o...@intel.com> > --- > > Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeatu > re.dsc | 54 -------------------- > Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMem > ory.fdf | 16 +++--- > > Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.ds > c | 18 +++++++ > 3 files changed, 26 insertions(+), 62 deletions(-) > > diff --git > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea > ture.dsc > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea > ture.dsc > index c1ce340da2..237a4fc006 100644 > --- > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea > ture.dsc > +++ > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea > t > +++ ure.dsc > @@ -34,54 +34,15 @@ > !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 > IpmiLib|MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf > - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > - > TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTem > plate.inf > > - ##################################### > - # IPMI Feature Package > - ##################################### > > IpmiCommandLib|IpmiFeaturePkg/Library/IpmiCommandLib/IpmiCommand > Lib.inf > > IpmiPlatformHookLib|IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/Ipm > iPlatformHookLibNull.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/PeiServicesTablePointerLibId > PeiServicesTablePointerLib|t/P > eiServicesTablePointerLibIdt.inf > - > ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiR > eportStatusCodeLib.inf > - > - ##################################### > - # IPMI Feature Package > - ##################################### > > IpmiBaseLib|IpmiFeaturePkg/Library/PeiIpmiBaseLib/PeiIpmiBaseLib.inf > > [LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.UEFI_DRIVER] > - ####################################### > - # Edk2 Packages > - ####################################### > - > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > - > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo > ryAllocationLib.inf > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > - > UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiB > UefiBootServicesTableLib|o > otServicesTableLib.inf > - > UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEnt > UefiDriverEntryPoint|ry > Point.inf > - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf > - > UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib > /UefiRuntimeServicesTableLib.inf > - > - ##################################### > - # IPMI Feature Package > - ##################################### > IpmiBaseLib|IpmiFeaturePkg/Library/IpmiBaseLib/IpmiBaseLib.inf > > > ########################################################## > ###################### > @@ -149,18 +110,3 @@ > IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf > IpmiFeaturePkg/OsWdt/OsWdt.inf > IpmiFeaturePkg/SolStatus/SolStatus.inf > - > - > ########################################################## > ######################################### > -# > -# 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/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe > mory.fdf > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe > mory.fdf > index 158b5455d8..e0f3bbe158 100644 > --- > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe > mory.fdf > +++ > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe > mo > +++ ry.fdf > @@ -7,11 +7,11 @@ > # > ## > > - INF IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf > - INF IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf > - INF RuleOverride = DRIVER_ACPITABLE > IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf > - INF IpmiFeaturePkg/BmcElog/BmcElog.inf > - INF IpmiFeaturePkg/Frb/FrbDxe.inf > - INF IpmiFeaturePkg/IpmiFru/IpmiFru.inf > - INF IpmiFeaturePkg/OsWdt/OsWdt.inf > - INF IpmiFeaturePkg/SolStatus/SolStatus.inf > +INF IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf > +INF IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf > +INF RuleOverride = DRIVER_ACPITABLE > IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf > +INF IpmiFeaturePkg/BmcElog/BmcElog.inf > +INF IpmiFeaturePkg/Frb/FrbDxe.inf > +INF IpmiFeaturePkg/IpmiFru/IpmiFru.inf > +INF IpmiFeaturePkg/OsWdt/OsWdt.inf > +INF IpmiFeaturePkg/SolStatus/SolStatus.inf > diff --git > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg. > dsc > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg. > dsc > index 6a3eed0882..c35e1e174e 100644 > --- > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg. > dsc > +++ > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg. > d > +++ sc > @@ -25,6 +25,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 (#85790): https://edk2.groups.io/g/devel/message/85790 Mute This Topic: https://groups.io/mt/88365333/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
