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

BaseTools: GenFds - use existing shared string

Browse Source 
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben
2018-04-28 06:32:50 +08:00
committed by Yonghong Zhu
parent d5d2b6bd24
commit ef4f218b3d
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,6 @@ from Common.LongFilePathSupport import CopyLongFilePath
from Common.LongFilePathSupport import OpenLongFilePath as open from Common.LongFilePathSupport import OpenLongFilePath as open
from Common.DataType import * from Common.DataType import *
T_CHAR_LF = '\n'
FV_UI_EXT_ENTY_GUID = 'A67DF1FA-8DE8-4E98-AF09-4BDF2EFFBC7C' FV_UI_EXT_ENTY_GUID = 'A67DF1FA-8DE8-4E98-AF09-4BDF2EFFBC7C'
## generate FV ## generate FV
@ -112,7 +111,7 @@ class FV (FvClassObject):
if not Flag: if not Flag:
self.FvInfFile.writelines("EFI_FILE_NAME = " + \ self.FvInfFile.writelines("EFI_FILE_NAME = " + \
FileName + \ FileName + \
T_CHAR_LF) TAB_LINE_BREAK)
# Process Modules in FfsList # Process Modules in FfsList
for FfsFile in self.FfsList : for FfsFile in self.FfsList :
@ -126,7 +125,7 @@ class FV (FvClassObject):
if not Flag: if not Flag:
self.FvInfFile.writelines("EFI_FILE_NAME = " + \ self.FvInfFile.writelines("EFI_FILE_NAME = " + \
FileName + \ FileName + \
T_CHAR_LF) TAB_LINE_BREAK)
if not Flag: if not Flag:
SaveFileOnChange(self.InfFileName, self.FvInfFile.getvalue(), False) SaveFileOnChange(self.InfFileName, self.FvInfFile.getvalue(), False)
self.FvInfFile.close() self.FvInfFile.close()
@ -271,36 +270,36 @@ class FV (FvClassObject):
# #
# Add [Options] # Add [Options]
# #
self.FvInfFile.writelines("[options]" + T_CHAR_LF) self.FvInfFile.writelines("[options]" + TAB_LINE_BREAK)
if BaseAddress is not None : if BaseAddress is not None :
self.FvInfFile.writelines("EFI_BASE_ADDRESS = " + \ self.FvInfFile.writelines("EFI_BASE_ADDRESS = " + \
BaseAddress + \ BaseAddress + \
T_CHAR_LF) TAB_LINE_BREAK)
if BlockSize is not None: if BlockSize is not None:
self.FvInfFile.writelines("EFI_BLOCK_SIZE = " + \ self.FvInfFile.writelines("EFI_BLOCK_SIZE = " + \
'0x%X' %BlockSize + \ '0x%X' %BlockSize + \
T_CHAR_LF) TAB_LINE_BREAK)
if BlockNum is not None: if BlockNum is not None:
self.FvInfFile.writelines("EFI_NUM_BLOCKS = " + \ self.FvInfFile.writelines("EFI_NUM_BLOCKS = " + \
' 0x%X' %BlockNum + \ ' 0x%X' %BlockNum + \
T_CHAR_LF) TAB_LINE_BREAK)
else: else:
if self.BlockSizeList == []: if self.BlockSizeList == []:
if not self._GetBlockSize(): if not self._GetBlockSize():
#set default block size is 1 #set default block size is 1
self.FvInfFile.writelines("EFI_BLOCK_SIZE = 0x1" + T_CHAR_LF) self.FvInfFile.writelines("EFI_BLOCK_SIZE = 0x1" + TAB_LINE_BREAK)
for BlockSize in self.BlockSizeList : for BlockSize in self.BlockSizeList :
if BlockSize[0] is not None: if BlockSize[0] is not None:
self.FvInfFile.writelines("EFI_BLOCK_SIZE = " + \ self.FvInfFile.writelines("EFI_BLOCK_SIZE = " + \
'0x%X' %BlockSize[0] + \ '0x%X' %BlockSize[0] + \
T_CHAR_LF) TAB_LINE_BREAK)
if BlockSize[1] is not None: if BlockSize[1] is not None:
self.FvInfFile.writelines("EFI_NUM_BLOCKS = " + \ self.FvInfFile.writelines("EFI_NUM_BLOCKS = " + \
' 0x%X' %BlockSize[1] + \ ' 0x%X' %BlockSize[1] + \
T_CHAR_LF) TAB_LINE_BREAK)
if self.BsBaseAddress is not None: if self.BsBaseAddress is not None:
self.FvInfFile.writelines('EFI_BOOT_DRIVER_BASE_ADDRESS = ' + \ self.FvInfFile.writelines('EFI_BOOT_DRIVER_BASE_ADDRESS = ' + \
@ -311,11 +310,11 @@ class FV (FvClassObject):
# #
# Add attribute # Add attribute
# #
self.FvInfFile.writelines("[attributes]" + T_CHAR_LF) self.FvInfFile.writelines("[attributes]" + TAB_LINE_BREAK)
self.FvInfFile.writelines("EFI_ERASE_POLARITY = " + \ self.FvInfFile.writelines("EFI_ERASE_POLARITY = " + \
' %s' %ErasePloarity + \ ' %s' %ErasePloarity + \
T_CHAR_LF) TAB_LINE_BREAK)
if not (self.FvAttributeDict is None): if not (self.FvAttributeDict is None):
for FvAttribute in self.FvAttributeDict.keys() : for FvAttribute in self.FvAttributeDict.keys() :
if FvAttribute == "FvUsedSizeEnable": if FvAttribute == "FvUsedSizeEnable":
@ -326,12 +325,12 @@ class FV (FvClassObject):
FvAttribute + \ FvAttribute + \
' = ' + \ ' = ' + \
self.FvAttributeDict[FvAttribute] + \ self.FvAttributeDict[FvAttribute] + \
T_CHAR_LF ) TAB_LINE_BREAK )
if self.FvAlignment is not None: if self.FvAlignment is not None:
self.FvInfFile.writelines("EFI_FVB2_ALIGNMENT_" + \ self.FvInfFile.writelines("EFI_FVB2_ALIGNMENT_" + \
self.FvAlignment.strip() + \ self.FvAlignment.strip() + \
" = TRUE" + \ " = TRUE" + \
T_CHAR_LF) TAB_LINE_BREAK)
# #
# Generate FV extension header file # Generate FV extension header file
@ -417,14 +416,14 @@ class FV (FvClassObject):
os.remove (self.InfFileName) os.remove (self.InfFileName)
self.FvInfFile.writelines("EFI_FV_EXT_HEADER_FILE_NAME = " + \ self.FvInfFile.writelines("EFI_FV_EXT_HEADER_FILE_NAME = " + \
FvExtHeaderFileName + \ FvExtHeaderFileName + \
T_CHAR_LF) TAB_LINE_BREAK)
# #
# Add [Files] # Add [Files]
# #
self.FvInfFile.writelines("[files]" + T_CHAR_LF) self.FvInfFile.writelines("[files]" + TAB_LINE_BREAK)
if VtfDict and self.UiFvName in VtfDict: if VtfDict and self.UiFvName in VtfDict:
self.FvInfFile.writelines("EFI_FILE_NAME = " + \ self.FvInfFile.writelines("EFI_FILE_NAME = " + \
VtfDict[self.UiFvName] + \ VtfDict[self.UiFvName] + \
T_CHAR_LF) TAB_LINE_BREAK)