tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert the change in r19137. 

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

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19138 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Yonghong Zhu 2015-12-07 09:01:44 +00:00 committed by yzhu52
parent eadb60d96f
commit ca9d6d7962
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BaseTools/Source/C/Include/Common/BuildVersion.h
View File

@ -12,4 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/ **/
#define __BUILD_VERSION "Build 99862" #define __BUILD_VERSION ""

43
BaseTools/Source/Python/GenFds/Fv.py
View File

@ -181,33 +181,30 @@ class FV (FvClassObject):
# #
# Write the Fv contents to Buffer # Write the Fv contents to Buffer
# #
if os.path.isfile(FvOutputFile): FvFileObj = open ( FvOutputFile,'r+b')
FvFileObj = open ( FvOutputFile,'r+b')
GenFdsGlobalVariable.VerboseLogger( "\nGenerate %s FV Successfully" %self.UiFvName) GenFdsGlobalVariable.VerboseLogger( "\nGenerate %s FV Successfully" %self.UiFvName)
GenFdsGlobalVariable.SharpCounter = 0 GenFdsGlobalVariable.SharpCounter = 0
Buffer.write(FvFileObj.read()) Buffer.write(FvFileObj.read())
FvFileObj.seek(0) FvFileObj.seek(0)
# PI FvHeader is 0x48 byte # PI FvHeader is 0x48 byte
FvHeaderBuffer = FvFileObj.read(0x48) FvHeaderBuffer = FvFileObj.read(0x48)
# FV alignment position. # FV alignment position.
FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F) FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)
# FvAlignmentValue is larger than or equal to 1K # FvAlignmentValue is larger than or equal to 1K
if FvAlignmentValue >= 0x400: if FvAlignmentValue >= 0x400:
if FvAlignmentValue >= 0x10000: if FvAlignmentValue >= 0x10000:
#The max alignment supported by FFS is 64K. #The max alignment supported by FFS is 64K.
self.FvAlignment = "64K" self.FvAlignment = "64K"
else:
self.FvAlignment = str (FvAlignmentValue / 0x400) + "K"
else: else:
# FvAlignmentValue is less than 1K self.FvAlignment = str (FvAlignmentValue / 0x400) + "K"
self.FvAlignment = str (FvAlignmentValue)
FvFileObj.close()
GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] = FvOutputFile
GenFdsGlobalVariable.LargeFileInFvFlags.pop()
else: else:
GenFdsGlobalVariable.ErrorLogger("Failed to generate %s FV file." %self.UiFvName) # FvAlignmentValue is less than 1K
self.FvAlignment = str (FvAlignmentValue)
FvFileObj.close()
GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] = FvOutputFile
GenFdsGlobalVariable.LargeFileInFvFlags.pop()
return FvOutputFile return FvOutputFile
## _GetBlockSize() ## _GetBlockSize()