import shutil\r
import subprocess\r
import StringIO\r
+from struct import *\r
\r
import Ffs\r
import AprioriSection\r
self.BaseAddress = None\r
self.InfFileName = None\r
self.FvAddressFileName = None\r
+ self.CapsuleName = None\r
\r
## AddToBuffer()\r
#\r
#\r
def AddToBuffer (self, Buffer, BaseAddress=None, BlockSize= None, BlockNum=None, ErasePloarity='1', VtfDict=None, MacroDict = {}) :\r
\r
- if self.UiFvName.upper() in GenFds.FvBinDict.keys():\r
- return GenFds.FvBinDict[self.UiFvName.upper()]\r
+ if self.UiFvName.upper() + 'fv' in GenFds.ImageBinDict.keys():\r
+ return GenFds.ImageBinDict[self.UiFvName.upper() + 'fv']\r
+ \r
+ #\r
+ # Check whether FV in Capsule is in FD flash region.\r
+ # If yes, return error. Doesn't support FV in Capsule image is also in FD flash region.\r
+ #\r
+ if self.CapsuleName != None:\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
+ for RegionData in RegionObj.RegionDataList:\r
+ if RegionData.endswith(".fv"):\r
+ continue\r
+ elif RegionData.upper() + 'fv' in GenFds.ImageBinDict.keys():\r
+ continue\r
+ elif self.UiFvName.upper() == RegionData.upper():\r
+ GenFdsGlobalVariable.ErrorLogger("Capsule %s in FD region can't contain a FV %s in FD region." % (self.CapsuleName, self.UiFvName.upper()))\r
\r
- GenFdsGlobalVariable.InfLogger( "\nGenerating %s FV ..." %self.UiFvName)\r
+ GenFdsGlobalVariable.InfLogger( "\nGenerating %s FV" %self.UiFvName)\r
\r
self.__InitializeInf__(BaseAddress, BlockSize, BlockNum, ErasePloarity, VtfDict)\r
#\r
#\r
FvFileObj = open ( FvOutputFile,'r+b')\r
\r
- GenFdsGlobalVariable.InfLogger( "\nGenerate %s FV Successfully" %self.UiFvName)\r
+ GenFdsGlobalVariable.VerboseLogger( "\nGenerate %s FV Successfully" %self.UiFvName)\r
GenFdsGlobalVariable.SharpCounter = 0\r
\r
Buffer.write(FvFileObj.read())\r
FvFileObj.close()\r
- GenFds.FvBinDict[self.UiFvName.upper()] = FvOutputFile\r
+ GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] = FvOutputFile\r
return FvOutputFile\r
\r
## __InitializeInf__()\r
self.FvAlignment.strip() + \\r
" = TRUE" + \\r
T_CHAR_LF)\r
- \r
- if self.FvNameGuid != None:\r
- self.FvInfFile.writelines("EFI_FVNAME_GUID" + \\r
- " = %s" % self.FvNameGuid + \\r
- T_CHAR_LF)\r
+ \r
#\r
- # Add [Files]\r
+ # Generate FV extension header file\r
#\r
+ if self.FvNameGuid == None or self.FvNameGuid == '':\r
+ if len(self.FvExtEntryType) > 0:\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
+ for Index in range (0, len(self.FvExtEntryType)):\r
+ if self.FvExtEntryType[Index] == 'FILE':\r
+ # check if the path is absolute or relative
+ if os.path.isabs(self.FvExtEntryData[Index]):
+ FileFullPath = os.path.normpath(self.FvExtEntryData[Index])
+ else:
+ FileFullPath = os.path.normpath(os.path.join(GenFdsGlobalVariable.WorkSpaceDir, self.FvExtEntryData[Index]))
+ # check if the file path exists or not
+ if not os.path.isfile(FileFullPath):
+ GenFdsGlobalVariable.ErrorLogger("Error opening FV Extension Header Entry file %s." % (self.FvExtEntryData[Index]))\r
+ FvExtFile = open (FileFullPath,'rb')\r
+ FvExtFile.seek(0,2)\r
+ Size = FvExtFile.tell()\r
+ if Size >= 0x10000:\r
+ GenFdsGlobalVariable.ErrorLogger("The size of FV Extension Header Entry file %s exceeds 0x10000." % (self.FvExtEntryData[Index]))\r
+ TotalSize += (Size + 4)\r
+ FvExtFile.seek(0)\r
+ Buffer += pack('HH', (Size + 4), int(self.FvExtEntryTypeValue[Index], 16))\r
+ Buffer += FvExtFile.read() \r
+ FvExtFile.close()\r
+ if self.FvExtEntryType[Index] == 'DATA':\r
+ ByteList = self.FvExtEntryData[Index].split(',')\r
+ Size = len (ByteList)\r
+ if Size >= 0x10000:\r
+ GenFdsGlobalVariable.ErrorLogger("The size of FV Extension Header Entry data %s exceeds 0x10000." % (self.FvExtEntryData[Index]))\r
+ TotalSize += (Size + 4)\r
+ Buffer += pack('HH', (Size + 4), int(self.FvExtEntryTypeValue[Index], 16))\r
+ for Index1 in range (0, Size):\r
+ Buffer += pack('B', int(ByteList[Index1], 16))\r
+\r
+ Guid = self.FvNameGuid.split('-')\r
+ Buffer = pack('LHHBBBBBBBBL', \r
+ int(Guid[0], 16), \r
+ int(Guid[1], 16), \r
+ int(Guid[2], 16), \r
+ int(Guid[3][-4:-2], 16), \r
+ int(Guid[3][-2:], 16), \r
+ int(Guid[4][-12:-10], 16),\r
+ int(Guid[4][-10:-8], 16),\r
+ int(Guid[4][-8:-6], 16),\r
+ int(Guid[4][-6:-4], 16),\r
+ int(Guid[4][-4:-2], 16),\r
+ int(Guid[4][-2:], 16),\r
+ TotalSize\r
+ ) + Buffer\r
+\r
+ #\r
+ # Generate FV extension header file if the total size is not zero\r
+ #\r
+ if TotalSize > 0:\r
+ FvExtHeaderFileName = os.path.join(GenFdsGlobalVariable.FvDir, self.UiFvName + '.ext')\r
+ FvExtHeaderFile = StringIO.StringIO()\r
+ FvExtHeaderFile.write(Buffer)\r
+ Changed = SaveFileOnChange(FvExtHeaderFileName, FvExtHeaderFile.getvalue(), True)\r
+ FvExtHeaderFile.close()\r
+ if Changed:\r
+ if os.path.exists (self.InfFileName):\r
+ os.remove (self.InfFileName)\r
+ self.FvInfFile.writelines("EFI_FV_EXT_HEADER_FILE_NAME = " + \\r
+ FvExtHeaderFileName + \\r
+ T_CHAR_LF)\r
\r
+ \r
+ #\r
+ # Add [Files]\r
+ #\r
self.FvInfFile.writelines("[files]" + T_CHAR_LF)\r
if VtfDict != None and self.UiFvName in VtfDict.keys():\r
self.FvInfFile.writelines("EFI_FILE_NAME = " + \\r
VtfDict.get(self.UiFvName) + \\r
T_CHAR_LF)\r
-\r
-\r