summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHess Chen <hesheng.chen@intel.com>2014-11-25 04:58:17 +0000
committerhchen30 <hchen30@Edk2>2014-11-25 04:58:17 +0000
commit1f0a062f8c5c46bffc911afda67e9f66e41af217 (patch)
treef3bf107f4cee0f18af561863f4fdadbdf2b705b8
parentd431bf6e56bac6e8b457a6531932dec13f03933a (diff)
downloadedk2-platforms-1f0a062f8c5c46bffc911afda67e9f66e41af217.tar.xz
BaseTools/UPT: Fix an issue of storing wrong PCD into XML file.
Fix an issue of storing wrong PCD into XML file to only store PcdEx for AsBuilt sections Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hess Chen <hesheng.chen@intel.com> Reviewed-by: Yingke Liu <yingke.d.liu@Intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16426 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py2
-rw-r--r--BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
index fa5f5af0e2..22e9ef5fc0 100644
--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
@@ -940,7 +940,7 @@ class InfPomAlignment(ModuleObject):
HelpTextObj.SetString(CommentItem.GetHelpStringItem())
Pcd.SetHelpTextList(Pcd.GetHelpTextList() + [HelpTextObj])
AsBuildPatchPcdList.append(Pcd)
- else:
+ elif PcdItem[0].upper() == DT.TAB_INF_PCD_EX.upper():
PcdItemObj = PcdItem[1]
Pcd = CommonObject.PcdObject()
Pcd.SetTokenSpaceGuidValue(PcdItemObj.GetTokenSpaceGuidValue())
diff --git a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
index d117468a17..4dc1c7edab 100644
--- a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
@@ -160,7 +160,7 @@ class BinaryFileXml(object):
GuiVerElemList = []
for LibGuidVer in LibGuidVerList:
- if IsMatchArch(LibGuidVer.GetSupArchList(), SupportArch):
+ if LibGuidVer.GetLibGuid() and IsMatchArch(LibGuidVer.GetSupArchList(), SupportArch):
GuiVerElem = \
CreateXmlElement('GUID', LibGuidVer.GetLibGuid(), [], [['Version', LibGuidVer.GetLibVersion()]])
GuiVerElemList.append(GuiVerElem)