Revision: 19375
          http://sourceforge.net/p/edk2/code/19375
Author:   vanjeff
Date:     2015-12-18 06:47:44 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
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.

(Sync patch r19139 from main trunk.)

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <[email protected]>
Reviewed-by: Liming Gao <[email protected]>

Revision Links:
--------------
    http://sourceforge.net/p/edk2/code/19139

Modified Paths:
--------------
    branches/UDK2015/BaseTools/Source/Python/build/BuildReport.py

Modified: branches/UDK2015/BaseTools/Source/Python/build/BuildReport.py
===================================================================
--- branches/UDK2015/BaseTools/Source/Python/build/BuildReport.py       
2015-12-18 06:47:07 UTC (rev 19374)
+++ branches/UDK2015/BaseTools/Source/Python/build/BuildReport.py       
2015-12-18 06:47:44 UTC (rev 19375)
@@ -1389,11 +1389,11 @@
         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


------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to