## @file\r
# process FV generation\r
#\r
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
self.CapsuleName = None\r
self.FvBaseAddress = None\r
self.FvForceRebase = None\r
+ self.FvRegionInFD = None\r
+ self.UsedSizeEnable = False\r
\r
## AddToBuffer()\r
#\r
#\r
# Write the Fv contents to Buffer\r
#\r
- FvFileObj = open ( FvOutputFile,'r+b')\r
+ if os.path.isfile(FvOutputFile):\r
+ FvFileObj = open ( FvOutputFile,'rb')\r
\r
- GenFdsGlobalVariable.VerboseLogger( "\nGenerate %s FV Successfully" %self.UiFvName)\r
- GenFdsGlobalVariable.SharpCounter = 0\r
+ GenFdsGlobalVariable.VerboseLogger( "\nGenerate %s FV Successfully" %self.UiFvName)\r
+ GenFdsGlobalVariable.SharpCounter = 0\r
\r
- Buffer.write(FvFileObj.read())\r
- FvFileObj.seek(0)\r
- # PI FvHeader is 0x48 byte\r
- FvHeaderBuffer = FvFileObj.read(0x48)\r
- # FV alignment position.\r
- FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)\r
- # FvAlignmentValue is larger than or equal to 1K\r
- if FvAlignmentValue >= 0x400:\r
- if FvAlignmentValue >= 0x10000:\r
- #The max alignment supported by FFS is 64K.\r
- self.FvAlignment = "64K"\r
+ Buffer.write(FvFileObj.read())\r
+ FvFileObj.seek(0)\r
+ # PI FvHeader is 0x48 byte\r
+ FvHeaderBuffer = FvFileObj.read(0x48)\r
+ # FV alignment position.\r
+ FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)\r
+ # FvAlignmentValue is larger than or equal to 1K\r
+ if FvAlignmentValue >= 0x400:\r
+ if FvAlignmentValue >= 0x100000:\r
+ #The max alignment supported by FFS is 16M.\r
+ if FvAlignmentValue >= 0x1000000:\r
+ self.FvAlignment = "16M"\r
+ else:\r
+ self.FvAlignment = str(FvAlignmentValue / 0x100000) + "M"\r
+ else:\r
+ self.FvAlignment = str (FvAlignmentValue / 0x400) + "K"\r
else:\r
- self.FvAlignment = str (FvAlignmentValue / 0x400) + "K"\r
+ # FvAlignmentValue is less than 1K\r
+ self.FvAlignment = str (FvAlignmentValue)\r
+ FvFileObj.close()\r
+ GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] = FvOutputFile\r
+ GenFdsGlobalVariable.LargeFileInFvFlags.pop()\r
else:\r
- # FvAlignmentValue is less than 1K\r
- self.FvAlignment = str (FvAlignmentValue)\r
- FvFileObj.close()\r
- GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] = FvOutputFile\r
- GenFdsGlobalVariable.LargeFileInFvFlags.pop()\r
+ GenFdsGlobalVariable.ErrorLogger("Failed to generate %s FV file." %self.UiFvName)\r
return FvOutputFile\r
\r
+ ## _GetBlockSize()\r
+ #\r
+ # Calculate FV's block size\r
+ # Inherit block size from FD if no block size specified in FV\r
+ #\r
+ def _GetBlockSize(self):\r
+ if self.BlockSizeList:\r
+ return True\r
+\r
+ for FdName in GenFdsGlobalVariable.FdfParser.Profile.FdDict.keys():\r
+ FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict[FdName]\r
+ for RegionObj in FdObj.RegionList:\r
+ if RegionObj.RegionType != 'FV':\r
+ continue\r
+ for RegionData in RegionObj.RegionDataList:\r
+ #\r
+ # Found the FD and region that contain this FV\r
+ #\r
+ if self.UiFvName.upper() == RegionData.upper():\r
+ RegionObj.BlockInfoOfRegion(FdObj.BlockSizeList, self)\r
+ if self.BlockSizeList:\r
+ return True\r
+ return False\r
+\r
## __InitializeInf__()\r
#\r
# Initilize the inf file to create FV\r
T_CHAR_LF)\r
else:\r
if self.BlockSizeList == []:\r
- #set default block size is 1\r
- self.FvInfFile.writelines("EFI_BLOCK_SIZE = 0x1" + T_CHAR_LF)\r
+ if not self._GetBlockSize():\r
+ #set default block size is 1\r
+ self.FvInfFile.writelines("EFI_BLOCK_SIZE = 0x1" + T_CHAR_LF)\r
\r
for BlockSize in self.BlockSizeList :\r
if BlockSize[0] != None:\r
T_CHAR_LF)\r
if not (self.FvAttributeDict == None):\r
for FvAttribute in self.FvAttributeDict.keys() :\r
+ if FvAttribute == "FvUsedSizeEnable":\r
+ if self.FvAttributeDict[FvAttribute].upper() in ('TRUE', '1') :\r
+ self.UsedSizeEnable = True\r
+ continue\r
self.FvInfFile.writelines("EFI_" + \\r
FvAttribute + \\r
' = ' + \\r
# Generate FV extension header file\r
#\r
if self.FvNameGuid == None or self.FvNameGuid == '':\r
- if len(self.FvExtEntryType) > 0:\r
+ if len(self.FvExtEntryType) > 0 or self.UsedSizeEnable:\r
GenFdsGlobalVariable.ErrorLogger("FV Extension Header Entries declared for %s with no FvNameGuid declaration." % (self.UiFvName))\r
\r
if self.FvNameGuid <> None and self.FvNameGuid <> '':\r
TotalSize = 16 + 4\r
Buffer = ''\r
+ if self.UsedSizeEnable:\r
+ TotalSize += (4 + 4)\r
+ ## define EFI_FV_EXT_TYPE_USED_SIZE_TYPE 0x03\r
+ #typedef struct\r
+ # {\r
+ # EFI_FIRMWARE_VOLUME_EXT_ENTRY Hdr;\r
+ # UINT32 UsedSize;\r
+ # } EFI_FIRMWARE_VOLUME_EXT_ENTRY_USED_SIZE_TYPE;\r
+ Buffer += pack('HHL', 8, 3, 0)\r
+\r
if self.FvNameString == 'TRUE':\r
#\r
# Create EXT entry for FV UI name\r