BaseTools: Fix an issue in HiiPcd generation

[edk2] [Patch] BaseTools: Fix an issue in HiiPcd generation

Posted by BobCF 6 years, 11 months ago

DynamicHiiPcd may be used by PEIM or DXE driver. 
All used DynamicHiiPcd value should be collected and placed into 
the default setting PCD PcdNvStoreDefaultValueBuffer.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
 BaseTools/Source/Python/AutoGen/AutoGen.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 8be5bfca83..758355c366 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1403,13 +1403,12 @@ class PlatformAutoGen(AutoGen):
                 if SkuId == None or SkuId == '':
                     continue
                 if len(Sku.VariableName) > 0:
                     VariableGuidStructure = Sku.VariableGuidValue
                     VariableGuid = GuidStructureStringToGuidString(VariableGuidStructure)
-                    if Pcd.Phase == "DXE":
-                        for StorageName in Sku.DefaultStoreDict:
-                            VariableInfo.append_variable(var_info(Index,pcdname,StorageName,SkuName, StringToArray(Sku.VariableName),VariableGuid, Sku.VariableAttribute , Sku.HiiDefaultValue,Sku.DefaultStoreDict[StorageName],Pcd.DatumType))
+                    for StorageName in Sku.DefaultStoreDict:
+                        VariableInfo.append_variable(var_info(Index,pcdname,StorageName,SkuName, StringToArray(Sku.VariableName),VariableGuid, Sku.VariableAttribute , Sku.HiiDefaultValue,Sku.DefaultStoreDict[StorageName],Pcd.DatumType))
             Index += 1
         return VariableInfo
 
     def UpdateNVStoreMaxSize(self,OrgVpdFile):
         if self.VariableInfo:
-- 
2.14.3.windows.1

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

Re: [edk2] [Patch] BaseTools: Fix an issue in HiiPcd generation

Posted by Gao, Liming 6 years, 11 months ago

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>BobCF
>Sent: Tuesday, January 02, 2018 8:59 AM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>
>Subject: [edk2] [Patch] BaseTools: Fix an issue in HiiPcd generation
>
>DynamicHiiPcd may be used by PEIM or DXE driver.
>All used DynamicHiiPcd value should be collected and placed into
>the default setting PCD PcdNvStoreDefaultValueBuffer.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>Cc: Liming Gao <liming.gao@intel.com>
>---
> BaseTools/Source/Python/AutoGen/AutoGen.py | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
>b/BaseTools/Source/Python/AutoGen/AutoGen.py
>index 8be5bfca83..758355c366 100644
>--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
>+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
>@@ -1403,13 +1403,12 @@ class PlatformAutoGen(AutoGen):
>                 if SkuId == None or SkuId == '':
>                     continue
>                 if len(Sku.VariableName) > 0:
>                     VariableGuidStructure = Sku.VariableGuidValue
>                     VariableGuid =
>GuidStructureStringToGuidString(VariableGuidStructure)
>-                    if Pcd.Phase == "DXE":
>-                        for StorageName in Sku.DefaultStoreDict:
>-
>VariableInfo.append_variable(var_info(Index,pcdname,StorageName,SkuNa
>me, StringToArray(Sku.VariableName),VariableGuid, Sku.VariableAttribute ,
>Sku.HiiDefaultValue,Sku.DefaultStoreDict[StorageName],Pcd.DatumType))
>+                    for StorageName in Sku.DefaultStoreDict:
>+
>VariableInfo.append_variable(var_info(Index,pcdname,StorageName,SkuNa
>me, StringToArray(Sku.VariableName),VariableGuid, Sku.VariableAttribute ,
>Sku.HiiDefaultValue,Sku.DefaultStoreDict[StorageName],Pcd.DatumType))
>             Index += 1
>         return VariableInfo
>
>     def UpdateNVStoreMaxSize(self,OrgVpdFile):
>         if self.VariableInfo:
>--
>2.14.3.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel