[edk2-devel][edk2-platforms][PATCH V1 11/27] UserAuthFeaturePkg: Use MinPlatformPkg build include files

Nate DeSimone nathaniel.l.desimone at intel.com
Thu Jan 13 02:49:30 UTC 2022


Reviewed-by: Nate DeSimone <nathaniel.l.desimone at intel.com>

> -----Original Message-----
> From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Oram,
> Isaac W
> Sent: Tuesday, January 11, 2022 6:20 PM
> To: devel at edk2.groups.io
> Cc: Oram, Isaac W <isaac.w.oram at intel.com>; Bi, Dandan
> <dandan.bi at intel.com>; Gao, Liming <gaoliming at byosoft.com.cn>
> Subject: [edk2-devel][edk2-platforms][PATCH V1 11/27]
> UserAuthFeaturePkg: Use MinPlatformPkg build include files
> 
> Use the MinPlatformPkg common core build files to build libraries needed by
> this feature.
> 
> Cc: Dandan Bi <dandan.bi at intel.com>
> Cc: Liming Gao <gaoliming at byosoft.com.cn>
> 
> Signed-off-by: Isaac Oram <isaac.w.oram at intel.com>
> ---
> 
> Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fd
> f      |  6 +-
> 
> Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeatur
> e.dsc | 80 ++------------------
> 
> Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.ds
> c      | 18 +++++
>  3 files changed, 27 insertions(+), 77 deletions(-)
> 
> diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.
> fdf
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.
> fdf
> index c534bebcc0..030dcbe763 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.
> fdf
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory
> +++ .fdf
> @@ -7,6 +7,6 @@
>  #
>  ##
> 
> -  INF
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.i
> nf
> -  INF
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe
> .inf
> -  INF
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm
> .inf
> +INF
> +UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe
> .inf
> +INF
> +UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dx
> e.inf
> +INF
> +UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSm
> m.inf
> diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeat
> ure.dsc
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFea
> ture.dsc
> index 7eeaf441c1..2f39a5580c 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeat
> ure.dsc
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFe
> +++ ature.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
> 
> 
> ##########################################################
> ######################
>  #
> @@ -34,47 +34,9 @@
>  !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
> -  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> -  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> -  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
> -  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
> -  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> -  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
> -  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> -
> TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTem
> plate.inf
> -
> UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBo
> otServicesTableLib.inf
> -
> UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry
> Point.inf
> -
> UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiService
> sLib.inf
> -  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
> -
> UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib
> /UefiRuntimeServicesTableLib.inf
> -  RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf
> -
> -  #####################################
> -  # User Authentication Feature Package
> -  #####################################
> 
> PlatformPasswordLib|UserAuthFeaturePkg/Library/PlatformPasswordLibNul
> l/PlatformPasswordLibNull.inf
> 
> UserPasswordLib|UserAuthFeaturePkg/Library/UserPasswordLib/UserPass
> wordLib.inf
> 
> -[LibraryClasses.common.DXE_DRIVER]
> -  #######################################
> -  # Edk2 Packages
> -  #######################################
> -
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo
> ryAllocationLib.inf
> -
> -[LibraryClasses.common.DXE_SMM_DRIVER]
> -  #######################################
> -  # Edk2 Packages
> -  #######################################
> -  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> -
> MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMe
> moryAllocationLib.inf
> -
> SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesT
> ableLib.inf
> -
> 
> ##########################################################
> #########################################
>  #
>  # Components Section - list of the modules and components that will be
> processed by compilation @@ -93,21 +55,6 @@
>  #       generated for it, but the binary will not be put into any firmware
> volume.
>  #
> 
> ##########################################################
> #########################################
> -#
> -# Feature PEI Components
> -#
> -
> -# @todo: Change below line to [Components.$(PEI_ARCH)] after
> https://bugzilla.tianocore.org/show_bug.cgi?id=2308
> -#        is completed.
> -[Components.IA32]
> -  #####################################
> -  # User Authentication 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.
> 
>  #
>  # Feature DXE Components
> @@ -128,18 +75,3 @@
> 
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.i
> nf
> 
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe
> .inf
> 
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm
> .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/UserAuthFeaturePkg/UserAuthFeaturePkg.
> dsc
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.
> dsc
> index 74eb9213ce..10360c5737 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.
> dsc
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg
> +++ .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 (#85635): https://edk2.groups.io/g/devel/message/85635
Mute This Topic: https://groups.io/mt/88365339/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-






More information about the edk2-devel-archive mailing list