diff options
Diffstat (limited to 'BaseTools/Source/Python')
| -rw-r--r-- | BaseTools/Source/Python/build/BuildReport.py | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py index 2eeaf4f..2d31be4 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -1814,13 +1814,21 @@ class FdRegionReport(object): for Ffs in Wa.FdfProfile.FvDict[FvName.upper()].FfsList:
for Section in Ffs.SectionList:
try:
- for FvSection in Section.SectionList:
- if FvSection.FvName in self.FvList:
- continue
- self._GuidsDb[Ffs.NameGuid.upper()] = FvSection.FvName
- self.FvList.append(FvSection.FvName)
- self.FvInfo[FvSection.FvName] = ("Nested FV", 0, 0)
- self._DiscoverNestedFvList(FvSection.FvName, Wa)
+ # Handle the case where an entire FFS is a FV, and not
+ # a sub-section of the FFS.
+ if getattr(Section, 'FvFileName', None) is None:
+ for FvSection in Section.SectionList:
+ if FvSection.FvName in self.FvList:
+ continue
+ self._GuidsDb[Ffs.NameGuid.upper()] = FvSection.FvName
+ self.FvList.append(FvSection.FvName)
+ self.FvInfo[FvSection.FvName] = ("Nested FV", 0, 0)
+ self._DiscoverNestedFvList(FvSection.FvName, Wa)
+ else:
+ self._GuidsDb[Ffs.NameGuid.upper()] = Section.FvFileName
+ self.FvList.append(Section.FvName)
+ self.FvInfo[Section.FvName] = ("Nested FV", 0, 0)
+ self._DiscoverNestedFvList(Section.FvName, Wa)
except AttributeError:
pass
|