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>; Bi, Dandan > <dandan...@intel.com>; Gao, Liming <gaolim...@byosoft.com.cn> > Subject: [edk2-devel][edk2-platforms][PATCH V1 13/27] > VirtualKeyboardFeaturePkg: Use MinPlatformPkg build include files > > Use the MinPlatformPkg common core build files to build libraries needed by > this feature. > > Cc: Dandan Bi <dandan...@intel.com> > Cc: Liming Gao <gaolim...@byosoft.com.cn> > > Signed-off-by: Isaac Oram <isaac.w.o...@intel.com> > --- > > Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/VirtualKe > yboardFeature.dsc | 62 +++----------------- > > Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardF > eaturePkg.dsc | 18 ++++++ > 2 files changed, 25 insertions(+), 55 deletions(-) > > diff --git > a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/Virtual > KeyboardFeature.dsc > b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/Virtual > KeyboardFeature.dsc > index 8179f70c80..0d4f14a412 100644 > --- > a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/Virtual > KeyboardFeature.dsc > +++ b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/Vir > +++ tualKeyboardFeature.dsc > @@ -18,43 +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 > - > - > ########################################################## > ###################### > -# > -# Library Class section - list of all Library Classes needed by this feature. > -# > - > ########################################################## > ###################### > - > -!include MdePkg/MdeLibs.dsc.inc > - > -[LibraryClasses] > - ####################################### > - # Edk2 Packages > - ####################################### > - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > - BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf > - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > - > UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBo > otServicesTableLib.inf > - > UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry > Point.inf > - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > - HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf > - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > - > UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiService > sLib.inf > - > UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib > /UefiRuntimeServicesTableLib.inf > - > -[LibraryClasses.common.UEFI_DRIVER] > - ####################################### > - # Edk2 Packages > - ####################################### > - > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo > ryAllocationLib.inf > + !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 > > > ########################################################## > ######################################### > # > @@ -74,26 +43,9 @@ > # generated for it, but the binary will not be put into any firmware > volume. > # > > ########################################################## > ######################################### > + > # > # Feature DXE Components > # > [Components.X64] > - ##################################### > - # Virtual Keyboard Feature Package > - ##################################### > VirtualKeyboardFeaturePkg/VirtualKeyboardDxe/VirtualKeyboardDxe.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/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboar > dFeaturePkg.dsc > b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboar > dFeaturePkg.dsc > index ea2005c6d2..6717c892f1 100644 > --- > a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboar > dFeaturePkg.dsc > +++ > b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyb > +++ oardFeaturePkg.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 (#85637): https://edk2.groups.io/g/devel/message/85637 Mute This Topic: https://groups.io/mt/88365340/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
