## @file\r
# process FD Region 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
from struct import *\r
from GenFdsGlobalVariable import GenFdsGlobalVariable\r
import StringIO\r
+import string\r
from CommonDataClass.FdfClass import RegionClassObject\r
import Common.LongFilePathOs as os\r
from stat import *\r
RegionClassObject.__init__(self)\r
\r
\r
+ ## PadBuffer()\r
+ #\r
+ # Add padding bytes to the Buffer\r
+ #\r
+ # @param Buffer The buffer the generated region data will be put\r
+ # in\r
+ # @param ErasePolarity Flash erase polarity\r
+ # @param Size Number of padding bytes requested\r
+ #\r
+\r
+ def PadBuffer(self, Buffer, ErasePolarity, Size):\r
+ if Size > 0:\r
+ if (ErasePolarity == '1') :\r
+ PadByte = pack('B', 0xFF)\r
+ else:\r
+ PadByte = pack('B', 0)\r
+ PadData = ''.join(PadByte for i in xrange(0, Size))\r
+ Buffer.write(PadData)\r
+\r
## AddToBuffer()\r
#\r
# Add region data to the Buffer\r
# @retval string Generated FV file path\r
#\r
\r
- def AddToBuffer(self, Buffer, BaseAddress, BlockSizeList, ErasePolarity, ImageBinDict, vtfDict=None, MacroDict={}):\r
+ def AddToBuffer(self, Buffer, BaseAddress, BlockSizeList, ErasePolarity, ImageBinDict, vtfDict=None, MacroDict={}, Flag=False):\r
Size = self.Size\r
- GenFdsGlobalVariable.InfLogger('\nGenerate Region at Offset 0x%X' % self.Offset)\r
- GenFdsGlobalVariable.InfLogger(" Region Size = 0x%X" % Size)\r
+ if not Flag:\r
+ GenFdsGlobalVariable.InfLogger('\nGenerate Region at Offset 0x%X' % self.Offset)\r
+ GenFdsGlobalVariable.InfLogger(" Region Size = 0x%X" % Size)\r
GenFdsGlobalVariable.SharpCounter = 0\r
+ if Flag and (self.RegionType != 'FV'):\r
+ return\r
\r
if self.RegionType == 'FV':\r
#\r
FileName = None\r
if RegionData.endswith(".fv"):\r
RegionData = GenFdsGlobalVariable.MacroExtend(RegionData, MacroDict)\r
- GenFdsGlobalVariable.InfLogger(' Region FV File Name = .fv : %s' % RegionData)\r
+ if not Flag:\r
+ GenFdsGlobalVariable.InfLogger(' Region FV File Name = .fv : %s' % RegionData)\r
if RegionData[1] != ':' :\r
- RegionData = os.path.join (GenFdsGlobalVariable.WorkSpaceDir, RegionData)\r
+ RegionData = mws.join (GenFdsGlobalVariable.WorkSpaceDir, RegionData)\r
if not os.path.exists(RegionData):\r
EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=RegionData)\r
\r
FileName = RegionData\r
elif RegionData.upper() + 'fv' in ImageBinDict.keys():\r
- GenFdsGlobalVariable.InfLogger(' Region Name = FV')\r
+ if not Flag:\r
+ GenFdsGlobalVariable.InfLogger(' Region Name = FV')\r
FileName = ImageBinDict[RegionData.upper() + 'fv']\r
else:\r
#\r
if RegionData.upper() in GenFdsGlobalVariable.FdfParser.Profile.FvDict.keys():\r
FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(RegionData.upper())\r
\r
- if FvObj != None :\r
- GenFdsGlobalVariable.InfLogger(' Region Name = FV')\r
+ if FvObj is not None :\r
+ if not Flag:\r
+ GenFdsGlobalVariable.InfLogger(' Region Name = FV')\r
#\r
# Call GenFv tool\r
#\r
FvBaseAddress = '0x%X' % self.FvAddress\r
BlockSize = None\r
BlockNum = None\r
- FvObj.AddToBuffer(FvBuffer, FvBaseAddress, BlockSize, BlockNum, ErasePolarity, vtfDict)\r
+ FvObj.AddToBuffer(FvBuffer, FvBaseAddress, BlockSize, BlockNum, ErasePolarity, vtfDict, Flag=Flag)\r
+ if Flag:\r
+ continue\r
+\r
if FvBuffer.len > Size:\r
FvBuffer.close()\r
EdkLogger.error("GenFds", GENFDS_ERROR,\r
#\r
# Add the exist Fv image into FD buffer\r
#\r
- if FileName != None:\r
- FileLength = os.stat(FileName)[ST_SIZE]\r
- if FileLength > Size:\r
- EdkLogger.error("GenFds", GENFDS_ERROR,\r
- "Size of FV File (%s) is larger than Region Size 0x%X specified." \\r
- % (RegionData, Size))\r
- BinFile = open(FileName, 'r+b')\r
- Buffer.write(BinFile.read())\r
- BinFile.close()\r
- Size = Size - FileLength\r
+ if not Flag:\r
+ if FileName is not None:\r
+ FileLength = os.stat(FileName)[ST_SIZE]\r
+ if FileLength > Size:\r
+ EdkLogger.error("GenFds", GENFDS_ERROR,\r
+ "Size of FV File (%s) is larger than Region Size 0x%X specified." \\r
+ % (RegionData, Size))\r
+ BinFile = open(FileName, 'rb')\r
+ Buffer.write(BinFile.read())\r
+ BinFile.close()\r
+ Size = Size - FileLength\r
#\r
# Pad the left buffer\r
#\r
- if Size > 0:\r
- if (ErasePolarity == '1') :\r
- PadData = 0xFF\r
- else :\r
- PadData = 0\r
- for i in range(0, Size):\r
- Buffer.write(pack('B', PadData))\r
+ if not Flag:\r
+ self.PadBuffer(Buffer, ErasePolarity, Size)\r
\r
if self.RegionType == 'CAPSULE':\r
#\r
RegionData = GenFdsGlobalVariable.MacroExtend(RegionData, MacroDict)\r
GenFdsGlobalVariable.InfLogger(' Region CAPSULE Image Name = .cap : %s' % RegionData)\r
if RegionData[1] != ':' :\r
- RegionData = os.path.join (GenFdsGlobalVariable.WorkSpaceDir, RegionData)\r
+ RegionData = mws.join (GenFdsGlobalVariable.WorkSpaceDir, RegionData)\r
if not os.path.exists(RegionData):\r
EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=RegionData)\r
\r
if RegionData.upper() in GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict.keys():\r
CapsuleObj = GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict[RegionData.upper()]\r
\r
- if CapsuleObj != None :\r
+ if CapsuleObj is not None :\r
CapsuleObj.CapsuleName = RegionData.upper()\r
GenFdsGlobalVariable.InfLogger(' Region Name = CAPSULE')\r
#\r
EdkLogger.error("GenFds", GENFDS_ERROR,\r
"Size 0x%X of Capsule File (%s) is larger than Region Size 0x%X specified." \\r
% (FileLength, RegionData, Size))\r
- BinFile = open(FileName, 'r+b')\r
+ BinFile = open(FileName, 'rb')\r
Buffer.write(BinFile.read())\r
BinFile.close()\r
Size = Size - FileLength\r
#\r
# Pad the left buffer\r
#\r
- if Size > 0:\r
- if (ErasePolarity == '1') :\r
- PadData = 0xFF\r
- else :\r
- PadData = 0\r
- for i in range(0, Size):\r
- Buffer.write(pack('B', PadData))\r
+ self.PadBuffer(Buffer, ErasePolarity, Size)\r
\r
- if self.RegionType == 'FILE':\r
+ if self.RegionType in ('FILE', 'INF'):\r
for RegionData in self.RegionDataList:\r
- RegionData = GenFdsGlobalVariable.MacroExtend(RegionData, MacroDict)\r
- if RegionData[1] != ':' :\r
- RegionData = mws.join (GenFdsGlobalVariable.WorkSpaceDir, RegionData)\r
- if not os.path.exists(RegionData):\r
- EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=RegionData)\r
+ if self.RegionType == 'INF':\r
+ RegionData.__InfParse__(None)\r
+ if len(RegionData.BinFileList) != 1:\r
+ EdkLogger.error('GenFds', GENFDS_ERROR, 'INF in FD region can only contain one binary: %s' % RegionData)\r
+ File = RegionData.BinFileList[0]\r
+ RegionData = RegionData.PatchEfiFile(File.Path, File.Type)\r
+ else:\r
+ RegionData = GenFdsGlobalVariable.MacroExtend(RegionData, MacroDict)\r
+ if RegionData[1] != ':' :\r
+ RegionData = mws.join (GenFdsGlobalVariable.WorkSpaceDir, RegionData)\r
+ if not os.path.exists(RegionData):\r
+ EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=RegionData)\r
#\r
# Add the file image into FD buffer\r
#\r
#\r
# Pad the left buffer\r
#\r
- if Size > 0:\r
- if (ErasePolarity == '1') :\r
- PadData = 0xFF\r
- else :\r
- PadData = 0\r
- for i in range(0, Size):\r
- Buffer.write(pack('B', PadData))\r
+ self.PadBuffer(Buffer, ErasePolarity, Size)\r
\r
if self.RegionType == 'DATA' :\r
GenFdsGlobalVariable.InfLogger(' Region Name = DATA')\r
#\r
# Pad the left buffer\r
#\r
- if Size > 0:\r
- if (ErasePolarity == '1') :\r
- PadData = 0xFF\r
- else :\r
- PadData = 0\r
- for i in range(0, Size):\r
- Buffer.write(pack('B', PadData))\r
+ self.PadBuffer(Buffer, ErasePolarity, Size)\r
\r
- if self.RegionType == None:\r
+ if self.RegionType is None:\r
GenFdsGlobalVariable.InfLogger(' Region Name = None')\r
- if (ErasePolarity == '1') :\r
- PadData = 0xFF\r
- else :\r
- PadData = 0\r
- for i in range(0, Size):\r
- Buffer.write(pack('B', PadData))\r
+ self.PadBuffer(Buffer, ErasePolarity, Size)\r
\r
def GetFvAlignValue(self, Str):\r
AlignValue = 1\r
# first check whether FvObj.BlockSizeList items have only "BlockSize" or "NumBlocks",\r
# if so, use ExpectedList\r
for Item in FvObj.BlockSizeList:\r
- if Item[0] == None or Item[1] == None:\r
+ if Item[0] is None or Item[1] is None:\r
FvObj.BlockSizeList = ExpectedList\r
break\r
# make sure region size is no smaller than the summed block size in FV\r
projects / mirror_edk2.git / blobdiff