[edk2] [PATCH] FmpDevicePkg: Remove useless lib mapping in dsc

Star Zeng posted 1 patch 5 years, 7 months ago
Failed in applying to current master (apply log)
FmpDevicePkg/FmpDevicePkg.dsc | 34 ----------------------------------
1 file changed, 34 deletions(-)
[edk2] [PATCH] FmpDevicePkg: Remove useless lib mapping in dsc
Posted by Star Zeng 5 years, 7 months ago
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>

NOTE: This patch is based on thread
https://lists.01.org/pipermail/edk2-devel/2018-July/027810.html.

---
 FmpDevicePkg/FmpDevicePkg.dsc | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc
index 8d2436627dae..c04cb0efe86e 100644
--- a/FmpDevicePkg/FmpDevicePkg.dsc
+++ b/FmpDevicePkg/FmpDevicePkg.dsc
@@ -48,58 +48,24 @@ [Defines]
 
 [LibraryClasses]
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
-  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
-  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-  UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
-  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
   DebugLib|MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
-  PostCodeLib|MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
-
-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
-  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
-  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
   FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
-
   CapsuleUpdatePolicyLib|FmpDevicePkg/Library/CapsuleUpdatePolicyLibNull/CapsuleUpdatePolicyLibNull.inf
   FmpPayloadHeaderLib|FmpDevicePkg/Library/FmpPayloadHeaderLibV1/FmpPayloadHeaderLibV1.inf
   FmpDeviceLib|FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLibNull.inf
-  BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf
-  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
-
-[LibraryClasses.ARM, LibraryClasses.AARCH64]
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # [LibraryClasses.ARM, LibraryClasses.AARCH64] and NULL mean link this library
-  # into all ARM and AARCH64 images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
-  # Add support for stack protector
-  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
-
-[LibraryClasses.ARM]
-  ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
 
 [Components]
   #
-- 
2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] FmpDevicePkg: Remove useless lib mapping in dsc
Posted by Kinney, Michael D 5 years, 7 months ago
Star,

The ARM and AARCH64 specific lib mappings should not be removed.
That will break the FmpDevicePkg build for ARM and AARCH64.

Mike

> -----Original Message-----
> From: Zeng, Star
> Sent: Wednesday, August 1, 2018 3:30 AM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Subject: [PATCH] FmpDevicePkg: Remove useless lib
> mapping in dsc
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> 
> NOTE: This patch is based on thread
> https://lists.01.org/pipermail/edk2-devel/2018-
> July/027810.html.
> 
> ---
>  FmpDevicePkg/FmpDevicePkg.dsc | 34 -------------------
> ---------------
>  1 file changed, 34 deletions(-)
> 
> diff --git a/FmpDevicePkg/FmpDevicePkg.dsc
> b/FmpDevicePkg/FmpDevicePkg.dsc
> index 8d2436627dae..c04cb0efe86e 100644
> --- a/FmpDevicePkg/FmpDevicePkg.dsc
> +++ b/FmpDevicePkg/FmpDevicePkg.dsc
> @@ -48,58 +48,24 @@ [Defines]
> 
>  [LibraryClasses]
> 
> UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoin
> t/UefiDriverEntryPoint.inf
> -
> UefiApplicationEntryPoint|MdePkg/Library/UefiApplicatio
> nEntryPoint/UefiApplicationEntryPoint.inf
> 
> UefiBootServicesTableLib|MdePkg/Library/UefiBootService
> sTableLib/UefiBootServicesTableLib.inf
>    UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
> 
> UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeS
> ervicesTableLib/UefiRuntimeServicesTableLib.inf
> -
> UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntim
> eLib.inf
> 
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocation
> Lib/UefiMemoryAllocationLib.inf
> 
> DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevi
> cePathLib.inf
> -  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> -
> UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
>    BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
> 
> BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLi
> b.inf
> -
> SynchronizationLib|MdePkg/Library/BaseSynchronizationLi
> b/BaseSynchronizationLib.inf
> 
> PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> 
> DebugLib|MdePkg/Library/UefiDebugLibStdErr/UefiDebugLib
> StdErr.inf
> 
> DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintEr
> rorLevelLib/BaseDebugPrintErrorLevelLib.inf
> -
> PostCodeLib|MdePkg/Library/BasePostCodeLibPort80/BasePo
> stCodeLibPort80.inf
> 
> PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
> -
> DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeService
> sLib.inf
> -
> -
> UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeS
> ervicesTableLib/UefiRuntimeServicesTableLib.inf
> -  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
> -
> DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevi
> cePathLib.inf
> -
> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManager
> Lib/UefiBootManagerLib.inf
> -
> DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/
> DxeServicesTableLib.inf
> -
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocation
> Lib/UefiMemoryAllocationLib.inf
> -  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
> 
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> 
> IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLi
> b.inf
> 
> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLi
> b.inf
> 
> FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticat
> ionLibPkcs7/FmpAuthenticationLibPkcs7.inf
> -
> 
> CapsuleUpdatePolicyLib|FmpDevicePkg/Library/CapsuleUpda
> tePolicyLibNull/CapsuleUpdatePolicyLibNull.inf
> 
> FmpPayloadHeaderLib|FmpDevicePkg/Library/FmpPayloadHead
> erLibV1/FmpPayloadHeaderLibV1.inf
> 
> FmpDeviceLib|FmpDevicePkg/Library/FmpDeviceLibNull/FmpD
> eviceLibNull.inf
> -
> BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/Ba
> seBmpSupportLib.inf
> -
> SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib
> .inf
> -
> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCap
> suleLib.inf
> -
> -[LibraryClasses.ARM, LibraryClasses.AARCH64]
> -  #
> -  # It is not possible to prevent the ARM compiler for
> generic intrinsic functions.
> -  # This library provides the instrinsic functions
> generate by a given compiler.
> -  # [LibraryClasses.ARM, LibraryClasses.AARCH64] and
> NULL mean link this library
> -  # into all ARM and AARCH64 images.
> -  #
> -
> NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntri
> nsicsLib.inf
> -
> -  # Add support for stack protector
> -
> NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib
> .inf
> -
> -[LibraryClasses.ARM]
> -
> ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftF
> loatLib.inf
> 
>  [Components]
>    #
> --
> 2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] FmpDevicePkg: Remove useless lib mapping in dsc
Posted by Kinney, Michael D 5 years, 7 months ago
Star,

I have verified that removing the rest of the lib
mappings still builds, so those changes look good.

I have integrated these changes except the ARM/AARCH64
changes into a V6 version of the patch series.

Thanks,

Mike

> -----Original Message-----
> From: Kinney, Michael D
> Sent: Wednesday, August 1, 2018 7:15 AM
> To: Zeng, Star <star.zeng@intel.com>; edk2-
> devel@lists.01.org; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Subject: RE: [PATCH] FmpDevicePkg: Remove useless lib
> mapping in dsc
> 
> Star,
> 
> The ARM and AARCH64 specific lib mappings should not be
> removed.
> That will break the FmpDevicePkg build for ARM and
> AARCH64.
> 
> Mike
> 
> > -----Original Message-----
> > From: Zeng, Star
> > Sent: Wednesday, August 1, 2018 3:30 AM
> > To: edk2-devel@lists.01.org
> > Cc: Zeng, Star <star.zeng@intel.com>; Kinney, Michael
> D
> > <michael.d.kinney@intel.com>
> > Subject: [PATCH] FmpDevicePkg: Remove useless lib
> > mapping in dsc
> >
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Contributed-under: TianoCore Contribution Agreement
> 1.1
> > Signed-off-by: Star Zeng <star.zeng@intel.com>
> >
> > NOTE: This patch is based on thread
> > https://lists.01.org/pipermail/edk2-devel/2018-
> > July/027810.html.
> >
> > ---
> >  FmpDevicePkg/FmpDevicePkg.dsc | 34 -----------------
> --
> > ---------------
> >  1 file changed, 34 deletions(-)
> >
> > diff --git a/FmpDevicePkg/FmpDevicePkg.dsc
> > b/FmpDevicePkg/FmpDevicePkg.dsc
> > index 8d2436627dae..c04cb0efe86e 100644
> > --- a/FmpDevicePkg/FmpDevicePkg.dsc
> > +++ b/FmpDevicePkg/FmpDevicePkg.dsc
> > @@ -48,58 +48,24 @@ [Defines]
> >
> >  [LibraryClasses]
> >
> >
> UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoin
> > t/UefiDriverEntryPoint.inf
> > -
> >
> UefiApplicationEntryPoint|MdePkg/Library/UefiApplicatio
> > nEntryPoint/UefiApplicationEntryPoint.inf
> >
> >
> UefiBootServicesTableLib|MdePkg/Library/UefiBootService
> > sTableLib/UefiBootServicesTableLib.inf
> >    UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
> >
> >
> UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeS
> > ervicesTableLib/UefiRuntimeServicesTableLib.inf
> > -
> >
> UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntim
> > eLib.inf
> >
> >
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocation
> > Lib/UefiMemoryAllocationLib.inf
> >
> >
> DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevi
> > cePathLib.inf
> > -
> UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> > -
> >
> UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> >    BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
> >
> >
> BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLi
> > b.inf
> > -
> >
> SynchronizationLib|MdePkg/Library/BaseSynchronizationLi
> > b/BaseSynchronizationLib.inf
> >
> > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> >
> >
> DebugLib|MdePkg/Library/UefiDebugLibStdErr/UefiDebugLib
> > StdErr.inf
> >
> >
> DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintEr
> > rorLevelLib/BaseDebugPrintErrorLevelLib.inf
> > -
> >
> PostCodeLib|MdePkg/Library/BasePostCodeLibPort80/BasePo
> > stCodeLibPort80.inf
> >
> >
> PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
> > -
> >
> DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeService
> > sLib.inf
> > -
> > -
> >
> UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeS
> > ervicesTableLib/UefiRuntimeServicesTableLib.inf
> > -  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
> > -
> >
> DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevi
> > cePathLib.inf
> > -
> >
> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManager
> > Lib/UefiBootManagerLib.inf
> > -
> >
> DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/
> > DxeServicesTableLib.inf
> > -
> >
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocation
> > Lib/UefiMemoryAllocationLib.inf
> > -  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
> >
> >
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> >
> >
> IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLi
> > b.inf
> >
> >
> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLi
> > b.inf
> >
> >
> FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticat
> > ionLibPkcs7/FmpAuthenticationLibPkcs7.inf
> > -
> >
> >
> CapsuleUpdatePolicyLib|FmpDevicePkg/Library/CapsuleUpda
> > tePolicyLibNull/CapsuleUpdatePolicyLibNull.inf
> >
> >
> FmpPayloadHeaderLib|FmpDevicePkg/Library/FmpPayloadHead
> > erLibV1/FmpPayloadHeaderLibV1.inf
> >
> >
> FmpDeviceLib|FmpDevicePkg/Library/FmpDeviceLibNull/FmpD
> > eviceLibNull.inf
> > -
> >
> BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/Ba
> > seBmpSupportLib.inf
> > -
> >
> SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib
> > .inf
> > -
> >
> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCap
> > suleLib.inf
> > -
> > -[LibraryClasses.ARM, LibraryClasses.AARCH64]
> > -  #
> > -  # It is not possible to prevent the ARM compiler
> for
> > generic intrinsic functions.
> > -  # This library provides the instrinsic functions
> > generate by a given compiler.
> > -  # [LibraryClasses.ARM, LibraryClasses.AARCH64] and
> > NULL mean link this library
> > -  # into all ARM and AARCH64 images.
> > -  #
> > -
> >
> NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntri
> > nsicsLib.inf
> > -
> > -  # Add support for stack protector
> > -
> >
> NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib
> > .inf
> > -
> > -[LibraryClasses.ARM]
> > -
> >
> ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftF
> > loatLib.inf
> >
> >  [Components]
> >    #
> > --
> > 2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel