## @ GenCfgOpt.py\r
#\r
-# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
##\r
import sys\r
import struct\r
from datetime import date\r
+from functools import reduce\r
\r
# Generated file copyright header\r
\r
self.string = ''\r
\r
def errExit(self, err = ''):\r
- print "ERROR: Express parsing for:"\r
- print " %s" % self.string\r
- print " %s^" % (' ' * self.index)\r
+ print ("ERROR: Express parsing for:")\r
+ print (" %s" % self.string)\r
+ print (" %s^" % (' ' * self.index))\r
if err:\r
- print "INFO : %s" % err\r
+ print ("INFO : %s" % err)\r
raise SystemExit\r
\r
def getNonNumber (self, n1, n2):\r
else:\r
Error = 0\r
if self.Debug:\r
- print "INFO : Macro dictionary:"\r
+ print ("INFO : Macro dictionary:")\r
for Each in self._MacroDict:\r
- print " $(%s) = [ %s ]" % (Each , self._MacroDict[Each])\r
+ print (" $(%s) = [ %s ]" % (Each , self._MacroDict[Each]))\r
return Error\r
\r
def EvaulateIfdef (self, Macro):\r
Result = Macro in self._MacroDict\r
if self.Debug:\r
- print "INFO : Eval Ifdef [%s] : %s" % (Macro, Result)\r
+ print ("INFO : Eval Ifdef [%s] : %s" % (Macro, Result))\r
return Result\r
\r
def ExpandMacros (self, Input):\r
Line = Line.replace(Each, self._MacroDict[Variable])\r
else:\r
if self.Debug:\r
- print "WARN : %s is not defined" % Each\r
+ print ("WARN : %s is not defined" % Each)\r
Line = Line.replace(Each, Each[2:-1])\r
return Line\r
\r
Line = Line.replace(PcdName, self._PcdsDict[PcdName])\r
else:\r
if self.Debug:\r
- print "WARN : %s is not defined" % PcdName\r
+ print ("WARN : %s is not defined" % PcdName)\r
return Line\r
\r
def EvaluateExpress (self, Expr):\r
LogExpr = CLogicalExpression()\r
Result = LogExpr.evaluateExpress (ExpExpr)\r
if self.Debug:\r
- print "INFO : Eval Express [%s] : %s" % (Expr, Result)\r
+ print ("INFO : Eval Express [%s] : %s" % (Expr, Result))\r
return Result\r
\r
def FormatListValue(self, ConfigDict):\r
bytearray = []\r
for each in dataarray:\r
value = each\r
- for loop in xrange(unit):\r
+ for loop in range(int(unit)):\r
bytearray.append("0x%02X" % (value & 0xFF))\r
value = value >> 8\r
newvalue = '{' + ','.join(bytearray) + '}'\r
if Match:\r
self._MacroDict[Match.group(1)] = Match.group(2)\r
if self.Debug:\r
- print "INFO : DEFINE %s = [ %s ]" % (Match.group(1), Match.group(2))\r
+ print ("INFO : DEFINE %s = [ %s ]" % (Match.group(1), Match.group(2)))\r
elif IsPcdSect:\r
#gSiPkgTokenSpaceGuid.PcdTxtEnable|FALSE\r
#gSiPkgTokenSpaceGuid.PcdOverclockEnable|TRUE\r
if Match:\r
self._PcdsDict[Match.group(1)] = Match.group(2)\r
if self.Debug:\r
- print "INFO : PCD %s = [ %s ]" % (Match.group(1), Match.group(2))\r
+ print ("INFO : PCD %s = [ %s ]" % (Match.group(1), Match.group(2)))\r
i = 0\r
while i < len(BuildOptionPcd):\r
Match = re.match("\s*([\w\.]+)\s*\=\s*(\w+)", BuildOptionPcd[i])\r
bitsvalue = bitsvalue[::-1]\r
bitslen = len(bitsvalue)\r
if start > bitslen or end > bitslen:\r
- print "Invalid bits offset [%d,%d] for %s" % (start, end, subitem['name'])\r
+ print ("Invalid bits offset [%d,%d] for %s" % (start, end, subitem['name']))\r
raise SystemExit\r
return hex(int(bitsvalue[start:end][::-1], 2))\r
\r
\r
if Match and Match.group(3) == 'END':\r
if (StructName != Match.group(1)) or (VariableName != Match.group(2)):\r
- print "Unmatched struct name '%s' and '%s' !" % (StructName, Match.group(1))\r
+ print ("Unmatched struct name '%s' and '%s' !" % (StructName, Match.group(1)))\r
else:\r
if IsUpdHdrDefined != True or IsUpdHeader != True:\r
NewTextBody.append ('} %s;\n\n' % StructName)\r
\r
\r
def Usage():\r
- print "GenCfgOpt Version 0.53"\r
- print "Usage:"\r
- print " GenCfgOpt UPDTXT PlatformDscFile BuildFvDir [-D Macros]"\r
- print " GenCfgOpt HEADER PlatformDscFile BuildFvDir InputHFile [-D Macros]"\r
- print " GenCfgOpt GENBSF PlatformDscFile BuildFvDir BsfOutFile [-D Macros]"\r
+ print ("GenCfgOpt Version 0.54")\r
+ print ("Usage:")\r
+ print (" GenCfgOpt UPDTXT PlatformDscFile BuildFvDir [-D Macros]")\r
+ print (" GenCfgOpt HEADER PlatformDscFile BuildFvDir InputHFile [-D Macros]")\r
+ print (" GenCfgOpt GENBSF PlatformDscFile BuildFvDir BsfOutFile [-D Macros]")\r
\r
def Main():\r
#\r
else:\r
DscFile = sys.argv[2]\r
if not os.path.exists(DscFile):\r
- print "ERROR: Cannot open DSC file '%s' !" % DscFile\r
+ print ("ERROR: Cannot open DSC file '%s' !" % DscFile)\r
return 2\r
\r
OutFile = ''\r
Start = 5\r
if argc > Start:\r
if GenCfgOpt.ParseMacros(sys.argv[Start:]) != 0:\r
- print "ERROR: Macro parsing failed !"\r
+ print ("ERROR: Macro parsing failed !")\r
return 3\r
\r
FvDir = sys.argv[3]\r
os.makedirs(FvDir)\r
\r
if GenCfgOpt.ParseDscFile(DscFile, FvDir) != 0:\r
- print "ERROR: %s !" % GenCfgOpt.Error\r
+ print ("ERROR: %s !" % GenCfgOpt.Error)\r
return 5\r
\r
if GenCfgOpt.UpdateSubRegionDefaultValue() != 0:\r
- print "ERROR: %s !" % GenCfgOpt.Error\r
+ print ("ERROR: %s !" % GenCfgOpt.Error)\r
return 7\r
\r
if sys.argv[1] == "UPDTXT":\r
if Ret != 0:\r
# No change is detected\r
if Ret == 256:\r
- print "INFO: %s !" % (GenCfgOpt.Error)\r
+ print ("INFO: %s !" % (GenCfgOpt.Error))\r
else :\r
- print "ERROR: %s !" % (GenCfgOpt.Error)\r
+ print ("ERROR: %s !" % (GenCfgOpt.Error))\r
return Ret\r
elif sys.argv[1] == "HEADER":\r
if GenCfgOpt.CreateHeaderFile(OutFile) != 0:\r
- print "ERROR: %s !" % GenCfgOpt.Error\r
+ print ("ERROR: %s !" % GenCfgOpt.Error)\r
return 8\r
elif sys.argv[1] == "GENBSF":\r
if GenCfgOpt.GenerateBsfFile(OutFile) != 0:\r
- print "ERROR: %s !" % GenCfgOpt.Error\r
+ print ("ERROR: %s !" % GenCfgOpt.Error)\r
return 9\r
else:\r
if argc < 5:\r
Usage()\r
return 1\r
- print "ERROR: Unknown command '%s' !" % sys.argv[1]\r
+ print ("ERROR: Unknown command '%s' !" % sys.argv[1])\r
Usage()\r
return 1\r
return 0\r
## @ PatchFv.py\r
#\r
-# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
##\r
if (offval & 0x80000000):\r
offval = fsize - (0xFFFFFFFF - offval + 1)\r
fd.seek(offval)\r
- bytearray = [ord(b) for b in fd.read(len)]\r
+ if sys.version_info[0] < 3:\r
+ bytearray = [ord(b) for b in fd.read(len)]\r
+ else:\r
+ bytearray = [b for b in fd.read(len)]\r
value = 0\r
idx = len - 1\r
while idx >= 0:\r
fd = open (binfile, "rb")\r
bindat = fd.read(0x200) # only read first 0x200 bytes\r
fd.close()\r
- HeaderList = ['FSPH' , 'FSPP' , 'FSPE'] # Check 'FSPH', 'FSPP', and 'FSPE' in the FSP header\r
+ HeaderList = [b'FSPH' , b'FSPP' , b'FSPE'] # Check 'FSPH', 'FSPP', and 'FSPE' in the FSP header\r
OffsetList = []\r
for each in HeaderList:\r
if each in bindat:\r
OffsetList.append(idx)\r
if not OffsetList[0] or not OffsetList[1]: # If 'FSPH' or 'FSPP' is missing, it will return false\r
return False\r
- Revision = ord(bindat[OffsetList[0] + 0x0B])\r
+ if sys.version_info[0] < 3:\r
+ Revision = ord(bindat[OffsetList[0] + 0x0B])\r
+ else:\r
+ Revision = bindat[OffsetList[0] + 0x0B]\r
#\r
# if revision is bigger than 1, it means it is FSP v1.1 or greater revision, which must contain 'FSPE'.\r
#\r
value = value >> 8\r
idx = idx + 1\r
fd.seek(offval)\r
- fd.write("".join(chr(b) for b in bytearray))\r
+ if sys.version_info[0] < 3:\r
+ fd.write("".join(chr(b) for b in bytearray))\r
+ else:\r
+ fd.write(bytes(bytearray))\r
fd.close()\r
return len\r
\r
# retval ret\r
#\r
def getSymbols(self, value):\r
- if self.dictSymbolAddress.has_key(value):\r
+ if value in self.dictSymbolAddress:\r
# Module:Function\r
ret = int (self.dictSymbolAddress[value], 16)\r
else:\r
#\r
# Print out the usage\r
#\r
-def usage():\r
- print "Usage: \n\tPatchFv FvBuildDir [FvFileBaseNames:]FdFileBaseNameToPatch \"Offset, Value\""\r
+def Usage():\r
+ print ("PatchFv Version 0.50")\r
+ print ("Usage: \n\tPatchFv FvBuildDir [FvFileBaseNames:]FdFileBaseNameToPatch \"Offset, Value\"")\r
\r
def main():\r
#\r
# If it fails to create dictionaries, then return an error.\r
#\r
if symTables.createDicts(sys.argv[1], sys.argv[2]) != 0:\r
- print "ERROR: Failed to create symbol dictionary!!"\r
+ print ("ERROR: Failed to create symbol dictionary!!")\r
return 2\r
\r
#\r
if ret:\r
raise Exception ("Patch failed for offset 0x%08X" % offset)\r
else:\r
- print "Patched offset 0x%08X:[%08X] with value 0x%08X # %s" % (offset, oldvalue, value, comment)\r
+ print ("Patched offset 0x%08X:[%08X] with value 0x%08X # %s" % (offset, oldvalue, value, comment))\r
\r
elif command == "COPY":\r
#\r
if ret:\r
raise Exception ("Copy failed from offset 0x%08X to offset 0x%08X!" % (src, dest))\r
else :\r
- print "Copied %d bytes from offset 0x%08X ~ offset 0x%08X # %s" % (clen, src, dest, comment)\r
+ print ("Copied %d bytes from offset 0x%08X ~ offset 0x%08X # %s" % (clen, src, dest, comment))\r
else:\r
raise Exception ("Unknown command %s!" % command)\r
return 0\r
\r
- except Exception as (ex):\r
- print "ERROR: %s" % ex\r
+ except Exception as ex:\r
+ print ("ERROR: %s" % ex)\r
return 1\r
\r
if __name__ == '__main__':\r
import struct\r
import argparse\r
from ctypes import *\r
+from functools import reduce\r
\r
"""\r
This utility supports some operations for Intel FSP 1.x/2.x image.\r
def Val2Bytes (value, blen):\r
return [(value>>(i*8) & 0xff) for i in range(blen)]\r
\r
+def IsIntegerType (val):\r
+ if sys.version_info[0] < 3:\r
+ if type(val) in (int, long):\r
+ return True\r
+ else:\r
+ if type(val) is int:\r
+ return True\r
+ return False\r
+\r
+def IsStrType (val):\r
+ if sys.version_info[0] < 3:\r
+ if type(val) is str:\r
+ return True\r
+ else:\r
+ if type(val) is bytes:\r
+ return True\r
+ return False\r
+\r
+def HandleNameStr (val):\r
+ if sys.version_info[0] < 3:\r
+ rep = "0x%X ('%s')" % (Bytes2Val (bytearray (val)), val)\r
+ else:\r
+ rep = "0x%X ('%s')" % (Bytes2Val (bytearray (val)), str (val, 'utf-8'))\r
+ return rep\r
+\r
def OutputStruct (obj, indent = 0, plen = 0):\r
if indent:\r
body = ''\r
body += OutputStruct (val, indent + 1)\r
plen -= sizeof(val)\r
else:\r
- if type(val) is str:\r
- rep = "0x%X ('%s')" % (Bytes2Val(bytearray(val)), val)\r
- elif type(val) in (int, long):\r
+ if IsStrType (val):\r
+ rep = HandleNameStr (val)\r
+ elif IsIntegerType (val):\r
rep = '0x%X' % val\r
elif isinstance(val, c_uint24):\r
rep = '0x%X' % val.get_value()\r
elif 'c_ubyte_Array' in str(type(val)):\r
if sizeof(val) == 16:\r
- rep = str(uuid.UUID(bytes = str(bytearray(val)))).upper()\r
+ if sys.version_info[0] < 3:\r
+ rep = str(bytearray(val))\r
+ else:\r
+ rep = bytes(val)\r
+ rep = str(uuid.UUID(bytes_le = rep)).upper()\r
else:\r
res = ['0x%02X'%i for i in bytearray(val)]\r
rep = '[%s]' % (','.join(res))\r
self.FvList = []\r
while offset < fdsize:\r
fvh = EFI_FIRMWARE_VOLUME_HEADER.from_buffer (self.FdData, offset)\r
- if '_FVH' != fvh.Signature:\r
+ if b'_FVH' != fvh.Signature:\r
raise Exception("ERROR: Invalid FV header !")\r
fv = FirmwareVolume (offset, self.FdData[offset:offset + fvh.FvLength])\r
fv.ParseFv ()\r
fspoffset = fv.Offset\r
offset = fspoffset + fihoffset\r
fih = FSP_INFORMATION_HEADER.from_buffer (self.FdData, offset)\r
- if 'FSPH' != fih.Signature:\r
+ if b'FSPH' != fih.Signature:\r
continue\r
\r
offset += fih.HeaderLength\r
plist = []\r
while True:\r
fch = FSP_COMMON_HEADER.from_buffer (self.FdData, offset)\r
- if 'FSPP' != fch.Signature:\r
+ if b'FSPP' != fch.Signature:\r
offset += fch.HeaderLength\r
offset = AlignPtr(offset, 4)\r
else:\r
def __init__(self, offset, data):\r
self.Offset = offset\r
tehdr = EFI_TE_IMAGE_HEADER.from_buffer (data, 0)\r
- if tehdr.Signature == 'VZ': # TE image\r
+ if tehdr.Signature == b'VZ': # TE image\r
self.TeHdr = tehdr\r
- elif tehdr.Signature == 'MZ': # PE image\r
+ elif tehdr.Signature == b'MZ': # PE image\r
self.TeHdr = None\r
self.DosHdr = EFI_IMAGE_DOS_HEADER.from_buffer (data, 0)\r
self.PeHdr = EFI_IMAGE_NT_HEADERS32.from_buffer (data, self.DosHdr.e_lfanew)\r
offset += sizeof(blkhdr)\r
# Read relocation type,offset pairs\r
rlen = blkhdr.BlockSize - sizeof(PE_RELOC_BLOCK_HEADER)\r
- rnum = rlen/sizeof(c_uint16)\r
+ rnum = int (rlen/sizeof(c_uint16))\r
rdata = (c_uint16 * rnum).from_buffer(self.Data, offset)\r
for each in rdata:\r
roff = each & 0xfff\r
if not name:\r
name = '\xff' * 16\r
else:\r
- name = str(bytearray(name))\r
- guid = uuid.UUID(bytes = name)\r
+ if sys.version_info[0] < 3:\r
+ name = str(bytearray(name))\r
+ else:\r
+ name = bytes(name)\r
+ guid = uuid.UUID(bytes_le = name)\r
print ("FV%d:" % idx)\r
print (" GUID : %s" % str(guid).upper())\r
print (" Offset : 0x%08X" % fv.Offset)\r
for fsp in fd.FspList:\r
fih = fsp.Fih\r
if firstfv:\r
- hfsp.write("#define FSP_IMAGE_ID 0x%016X /* '%s' */\n" % (Bytes2Val(bytearray(fih.ImageId)), fih.ImageId))\r
+ if sys.version_info[0] < 3:\r
+ hfsp.write("#define FSP_IMAGE_ID 0x%016X /* '%s' */\n" % (Bytes2Val(bytearray(fih.ImageId)), fih.ImageId))\r
+ else:\r
+ hfsp.write("#define FSP_IMAGE_ID 0x%016X /* '%s' */\n" % (Bytes2Val(bytearray(fih.ImageId)), str (fih.ImageId, 'utf-8')))\r
hfsp.write("#define FSP_IMAGE_REV 0x%08X \n\n" % fih.ImageRevision)\r
firstfv = False\r
fv = fd.FvList[fsp.FvIdxList[0]]\r
numcomp = len(FspComponent)\r
baselist = FspBase\r
if numcomp != len(baselist):\r
- print "ERROR: Required number of base does not match number of FSP component !"\r
+ print ("ERROR: Required number of base does not match number of FSP component !")\r
return\r
\r
newfspbin = fd.FdData[:]\r
break\r
\r
if not found:\r
- print "ERROR: Could not find FSP_%c component to rebase !" % fspcomp.upper()\r
+ print ("ERROR: Could not find FSP_%c component to rebase !" % fspcomp.upper())\r
return\r
\r
fspbase = baselist[idx]\r
newbase = int(fspbase)\r
oldbase = fsp.Fih.ImageBase\r
delta = newbase - oldbase\r
- print "Rebase FSP-%c from 0x%08X to 0x%08X:" % (ftype.upper(),oldbase,newbase)\r
+ print ("Rebase FSP-%c from 0x%08X to 0x%08X:" % (ftype.upper(),oldbase,newbase))\r
\r
imglist = []\r
for fvidx in fsp.FvIdxList:\r
pcount += img.Rebase(delta, newfspbin)\r
fcount += 1\r
\r
- print " Patched %d entries in %d TE/PE32 images." % (pcount, fcount)\r
+ print (" Patched %d entries in %d TE/PE32 images." % (pcount, fcount))\r
\r
(count, applied) = fsp.Patch(delta, newfspbin)\r
- print " Patched %d entries using FSP patch table." % applied\r
+ print (" Patched %d entries using FSP patch table." % applied)\r
if count != applied:\r
- print " %d invalid entries are ignored !" % (count - applied)\r
+ print (" %d invalid entries are ignored !" % (count - applied))\r
\r
if OutputFile == '':\r
filename = os.path.basename(FspBinary)\r
projects / mirror_edk2.git / commitdiff