Reviewed-by: Yonghong Zhu
Best Regards,
Zhu Yonghong
-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Yonghong
Zhu
Sent: Wednesday, August 29, 2018 11:57 AM
To: edk2-devel@lists.01.org
Cc: Gao, Liming
Subject: [edk2] [Patch] BaseTools: include variable namespace GUIDs of HII PCDs
in Guid.xref
From: zhijufan
[PcdsDynamicHii]
gFooTokenSpaceGuid.PcdBar|L"Variable"|gVarNameSpaceGuid|0x0|FALSE|NV,BS
This patch add the variable namespace GUIDs in "Guid.xref" that are used with
dynamic HII PCDs.
Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=452
Cc: Liming Gao
Cc: Yonghong Zhu
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan
---
BaseTools/Source/Python/GenFds/GenFds.py | 11 +++
1 file changed, 11 insertions(+)
diff --git a/BaseTools/Source/Python/GenFds/GenFds.py
b/BaseTools/Source/Python/GenFds/GenFds.py
index 2307a19..9dec9c5 100644
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -601,16 +601,27 @@ class GenFds :
print(ModuleObj.BaseName + ' ' + ModuleObj.ModuleType)
def GenerateGuidXRefFile(BuildDb, ArchList, FdfParserObj):
GuidXRefFileName = os.path.join(GenFdsGlobalVariable.FvDir,
"Guid.xref")
GuidXRefFile = BytesIO('')
+PkgGuidDict = {}
GuidDict = {}
ModuleList = []
FileGuidList = []
GuidPattern = gGuidPattern
for Arch in ArchList:
PlatformDataBase =
BuildDb.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch,
GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]
+PkgList =
GenFdsGlobalVariable.WorkSpace.GetPackageList(GenFdsGlobalVariable.ActivePlatform,
Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag)
+for P in PkgList:
+PkgGuidDict.update(P.Guids)
+for Name, Guid in PlatformDataBase.Pcds:
+Pcd = PlatformDataBase.Pcds[Name, Guid]
+if Pcd.Type in [TAB_PCDS_DYNAMIC_HII, TAB_PCDS_DYNAMIC_EX_HII]:
+for SkuId in Pcd.SkuInfoList:
+Sku = Pcd.SkuInfoList[SkuId]
+if Sku.VariableGuid and Sku.VariableGuid in
PkgGuidDict.keys():
+GuidDict[Sku.VariableGuid] =
+ PkgGuidDict[Sku.VariableGuid]
for ModuleFile in PlatformDataBase.Modules:
Module = BuildDb.BuildObject[ModuleFile, Arch,
GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]
if Module in ModuleList:
continue
else:
--
2.6.1.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
