From: Yonghong Zhu <yonghong.zhu@intel.com>
Date: Mon, 7 Dec 2015 09:03:35 +0000 (+0000)
Subject: BaseTools: Fix a bug in the VPD report generation
X-Git-Tag: edk2-stable201903~8366
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=043928da6a7c9c5427c12ca49bf625fc6f052526

BaseTools: Fix a bug in the VPD report generation

Changed the if condition to check whether current Region is FD VPD region
to fix a bug in the VPD report generation.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19139 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 722d8b7f45..d459a0113a 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1389,11 +1389,11 @@ class FdReport(object):
         self.FdRegionList = [FdRegionReport(FdRegion, Wa) for FdRegion in Fd.RegionList]
         self.FvPath = os.path.join(Wa.BuildDir, "FV")
         self.VpdFilePath = os.path.join(self.FvPath, "%s.map" % Wa.Platform.VpdToolGuid)
-        VpdPcdToken = 'gEfiMdeModulePkgTokenSpaceGuid'
-        VpdPcdName = 'PcdVpdBaseAddress'
+        self.VPDBaseAddress = 0
+        self.VPDSize = 0
         self.VPDInfoList = []
         for index, FdRegion in enumerate(Fd.RegionList):
-            if (VpdPcdName, VpdPcdToken) == FdRegion.PcdOffset:
+            if str(FdRegion.RegionType) is 'FILE' and Wa.Platform.VpdToolGuid in str(FdRegion.RegionDataList):
                 self.VPDBaseAddress = self.FdRegionList[index].BaseAddress
                 self.VPDSize = self.FdRegionList[index].Size
                 break