Hi Yonghong,

On 04/10/18 15:28, Yonghong Zhu wrote:
> Roll back the fixed at build pcd collection to include the pcd in
> Module and Library.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <[email protected]>
> ---
>  BaseTools/Source/Python/AutoGen/AutoGen.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py 
> b/BaseTools/Source/Python/AutoGen/AutoGen.py
> index 9280ae4..dbc9f89 100644
> --- a/BaseTools/Source/Python/AutoGen/AutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
> @@ -1277,11 +1277,11 @@ class PlatformAutoGen(AutoGen):
>      def CollectFixedAtBuildPcds(self):
>          for LibAuto in self.LibraryAutoGenList:
>              FixedAtBuildPcds = {}  
>              ShareFixedAtBuildPcdsSameValue = {} 
>              for Module in LibAuto._ReferenceModules:                
> -                for Pcd in Module.FixedAtBuildPcds:
> +                for Pcd in Module.FixedAtBuildPcds + 
> LibAuto.FixedAtBuildPcds:
>                      key = ".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName)) 
>  
>                      if key not in FixedAtBuildPcds:
>                          ShareFixedAtBuildPcdsSameValue[key] = True
>                          FixedAtBuildPcds[key] = Pcd.DefaultValue
>                      else:
> 

this change fixes the ArmVirtQemu build error for me.

I suggest using commit hash abbreviations longer than just 6 nibbles. 12
nibbles are more future proof (that size is used by the Linux kernel)
and it's also not a large burden to use. So, I suggest replacing
"eca980" in the subject line with "eca980c0c899".

With that change:

Tested-by: Laszlo Ersek <[email protected]>

Thanks!
Laszlo
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to