diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2016-05-06 17:14:26 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2016-05-11 12:25:44 +0800 |
| commit | 321151fedb3013fe3a588ee7a4fe6639ceb29c7e (patch) | |
| tree | 9a8c87037a3cae68b3820d82f61820716d91bddc | |
| parent | eafbd7a2325e39480c5be71cc8f456c78f1bfed0 (diff) | |
| download | edk2-321151fedb3013fe3a588ee7a4fe6639ceb29c7e.tar.gz edk2-321151fedb3013fe3a588ee7a4fe6639ceb29c7e.tar.bz2 edk2-321151fedb3013fe3a588ee7a4fe6639ceb29c7e.zip | |
BaseTools: Fix bug in GenFds to handle FV image alignment
Cover the case that .fv file in the [Binaries] section.
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
| -rw-r--r-- | BaseTools/Source/Python/GenFds/FvImageSection.py | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py index b577de263c..748d02f700 100644 --- a/BaseTools/Source/Python/GenFds/FvImageSection.py +++ b/BaseTools/Source/Python/GenFds/FvImageSection.py @@ -60,10 +60,35 @@ class FvImageSection(FvImageSectionClassObject): Num = SecNum
- for FileName in FileList:
+ MaxFvAlignment = 0
+ for FvFileName in FileList:
+ FvAlignmentValue = 0
+ if os.path.isfile(FvFileName):
+ FvFileObj = open (FvFileName,'r+b')
+ FvFileObj.seek(0)
+ # PI FvHeader is 0x48 byte
+ FvHeaderBuffer = FvFileObj.read(0x48)
+ # FV alignment position.
+ FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)
+ FvFileObj.close()
+ if FvAlignmentValue > MaxFvAlignment:
+ MaxFvAlignment = FvAlignmentValue
+
OutputFile = os.path.join(OutputPath, ModuleName + 'SEC' + Num + Ffs.SectionSuffix.get("FV_IMAGE"))
GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE')
OutputFileList.append(OutputFile)
+
+ # MaxFvAlignment is larger than or equal to 1K
+ if MaxFvAlignment >= 0x400:
+ if MaxFvAlignment >= 0x10000:
+ #The max alignment supported by FFS is 64K.
+ self.Alignment = "64K"
+ else:
+ self.Alignment = str (MaxFvAlignment / 0x400) + "K"
+ else:
+ # MaxFvAlignment is less than 1K
+ self.Alignment = str (MaxFvAlignment)
+
return OutputFileList, self.Alignment
#
# Generate Fv
|