sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Fix the bug to search Fv.txt file relative to workspace

Browse Source 
when the SECTION FV_IMAGE = $(XX)/XX.Fv, the Fv file should relative to
WORKSPACE, so when we search the XX.Fv.txt file, we should search the
path relative to workspace first.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Yonghong Zhu 2018-03-03 01:09:03 +08:00 committed by Liming Gao
parent 24326f381f
commit aebe5a36b6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BaseTools/Source/Python/build/BuildReport.py
View File

@ -1677,6 +1677,7 @@ class FdRegionReport(object):
self.FvInfo = {} self.FvInfo = {}
self._GuidsDb = {} self._GuidsDb = {}
self._FvDir = Wa.FvDir self._FvDir = Wa.FvDir
self._WorkspaceDir = Wa.WorkspaceDir
# #
# If the input FdRegion is not a firmware volume, # If the input FdRegion is not a firmware volume,
@ -1780,13 +1781,15 @@ class FdRegionReport(object):
FvTotalSize = 0 FvTotalSize = 0
FvTakenSize = 0 FvTakenSize = 0
FvFreeSize = 0 FvFreeSize = 0
if not os.path.isfile(FvName):
FvReportFileName = os.path.join(self._FvDir, FvName + ".Fv.txt")
else:
if FvName.upper().endswith('.FV'): if FvName.upper().endswith('.FV'):
FvReportFileName = FvName + ".txt" FileExt = FvName + ".txt"
else: else:
FvReportFileName = FvName + ".Fv.txt" FileExt = FvName + ".Fv.txt"
if not os.path.isfile(FileExt):
FvReportFileName = mws.join(self._WorkspaceDir, FileExt)
if not os.path.isfile(FvReportFileName):
FvReportFileName = os.path.join(self._FvDir, FileExt)
try: try:
# #
# Collect size info in the firmware volume. # Collect size info in the firmware volume.