Re: [edk2] [Patch] BaseTools: Fixed build failure for the case that A pcd is initialized under one SKU but is uninitialized under another SKU.

[Gao, Liming]

Reviewed-by: Liming Gao 

>-Original Message-
>From: Feng, Bob C
>Sent: Tuesday, January 23, 2018 9:39 AM
>To: edk2-devel@lists.01.org
>Cc: Feng, Bob C ; Gao, Liming 
>Subject: [Patch] BaseTools: Fixed build failure for the case that A pcd is
>initialized under one SKU but is uninitialized under another SKU.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Bob Feng 
>Cc: Liming Gao 
>---
> BaseTools/Source/Python/AutoGen/GenPcdDb.py | 16 ++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
>diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
>b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
>index 22283ef7fe..82360ae57d 100644
>--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
>+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
>@@ -1022,10 +1022,23 @@ def CreateAutoGen(PcdDriverAutoGenData):
> return (PcdDriverAutoGenData[(skuname,skuid)][0],autogenC)
> def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform,Phase):
> def prune_sku(pcd,skuname):
> new_pcd = copy.deepcopy(pcd)
> new_pcd.SkuInfoList = {skuname:pcd.SkuInfoList[skuname]}
>+new_pcd.isinit = 'INIT'
>+if new_pcd.DatumType in ['UINT8','UINT16','UINT32','UINT64']:
>+for skuobj in pcd.SkuInfoList.values():
>+if skuobj.DefaultValue:
>+defaultvalue = int(skuobj.DefaultValue,16) if
>skuobj.DefaultValue.upper().startswith("0X") else int(skuobj.DefaultValue,10)
>+if defaultvalue  != 0:
>+new_pcd.isinit = "INIT"
>+break
>+elif skuobj.VariableName:
>+new_pcd.isinit = "INIT"
>+break
>+else:
>+new_pcd.isinit = "UNINIT"
> return new_pcd
> DynamicPcds = Platform.DynamicPcdList
> DynamicPcdSet_Sku = {(SkuName,skuobj.SkuId):[] for pcd in DynamicPcds
>for (SkuName,skuobj) in pcd.SkuInfoList.items() }
> for skuname,skuid in DynamicPcdSet_Sku:
> DynamicPcdSet_Sku[(skuname,skuid)] = [prune_sku(pcd,skuname) for
>pcd in DynamicPcds]
>@@ -1399,12 +1412,11 @@ def CreatePcdDatabasePhaseSpecificAutoGen
>(Platform, DynamicPcdList, Phase):
> if "PCD_TYPE_HII" not in Pcd.TokenTypeList:
> Pcd.TokenTypeList += ['PCD_TYPE_DATA']
> if Sku.DefaultValue == 'TRUE':
> Pcd.InitString = 'INIT'
> else:
>-if int(Sku.DefaultValue, 0) != 0:
>-Pcd.InitString = 'INIT'
>+Pcd.InitString = Pcd.isinit
> #
> # For UNIT64 type PCD's value, ULL should be append to avoid
> # warning under linux building environment.
> #
> if Pcd.DatumType == "UINT64":
>--
>2.14.3.windows.1

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

[edk2] [Patch] BaseTools: Fixed build failure for the case that A pcd is initialized under one SKU but is uninitialized under another SKU.

[BobCF]

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng 
Cc: Liming Gao 
---
 BaseTools/Source/Python/AutoGen/GenPcdDb.py | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py 
b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index 22283ef7fe..82360ae57d 100644
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -1022,10 +1022,23 @@ def CreateAutoGen(PcdDriverAutoGenData):
 return (PcdDriverAutoGenData[(skuname,skuid)][0],autogenC)
 def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform,Phase):
 def prune_sku(pcd,skuname):
 new_pcd = copy.deepcopy(pcd)
 new_pcd.SkuInfoList = {skuname:pcd.SkuInfoList[skuname]}
+new_pcd.isinit = 'INIT'
+if new_pcd.DatumType in ['UINT8','UINT16','UINT32','UINT64']:
+for skuobj in pcd.SkuInfoList.values():
+if skuobj.DefaultValue:
+defaultvalue = int(skuobj.DefaultValue,16) if 
skuobj.DefaultValue.upper().startswith("0X") else int(skuobj.DefaultValue,10)
+if defaultvalue  != 0:
+new_pcd.isinit = "INIT"
+break
+elif skuobj.VariableName:
+new_pcd.isinit = "INIT"
+break
+else:
+new_pcd.isinit = "UNINIT"
 return new_pcd
 DynamicPcds = Platform.DynamicPcdList
 DynamicPcdSet_Sku = {(SkuName,skuobj.SkuId):[] for pcd in DynamicPcds for 
(SkuName,skuobj) in pcd.SkuInfoList.items() }
 for skuname,skuid in DynamicPcdSet_Sku:
 DynamicPcdSet_Sku[(skuname,skuid)] = [prune_sku(pcd,skuname) for pcd 
in DynamicPcds]
@@ -1399,12 +1412,11 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, 
DynamicPcdList, Phase):
 if "PCD_TYPE_HII" not in Pcd.TokenTypeList:
 Pcd.TokenTypeList += ['PCD_TYPE_DATA']
 if Sku.DefaultValue == 'TRUE':
 Pcd.InitString = 'INIT'
 else:
-if int(Sku.DefaultValue, 0) != 0:
-Pcd.InitString = 'INIT'
+Pcd.InitString = Pcd.isinit
 #
 # For UNIT64 type PCD's value, ULL should be append to avoid
 # warning under linux building environment.
 #
 if Pcd.DatumType == "UINT64":
-- 
2.14.3.windows.1

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