"Das U-Boot" Source Tree

microcode_tool: Convert to Python 3

Convert this tool to Python 3 and make it use that, to meet the 2020
deadline.

Signed-off-by: Simon Glass <sjg@chromium.org>

+14 -14
+14 -14
tools/microcode-tool.py
··· 1 - #!/usr/bin/env python2 1 + #!/usr/bin/env python3 2 2 # SPDX-License-Identifier: GPL-2.0+ 3 3 # 4 4 # Copyright (c) 2014 Google, Inc ··· 126 126 microcodes: Dict of Microcode objects indexed by name 127 127 model: Model string to search for, or None 128 128 """ 129 - print 'Date: %s' % date 129 + print('Date: %s' % date) 130 130 if model: 131 131 mcode_list, tried = FindMicrocode(microcodes, model.lower()) 132 - print 'Matching models %s:' % (', '.join(tried)) 132 + print('Matching models %s:' % (', '.join(tried))) 133 133 else: 134 - print 'All models:' 135 - mcode_list = [microcodes[m] for m in microcodes.keys()] 134 + print('All models:') 135 + mcode_list = [microcodes[m] for m in list(microcodes.keys())] 136 136 for mcode in mcode_list: 137 - print '%-20s: model %s' % (mcode.name, mcode.model) 137 + print('%-20s: model %s' % (mcode.name, mcode.model)) 138 138 139 139 def FindMicrocode(microcodes, model): 140 140 """Find all the microcode chunks which match the given model. ··· 164 164 for i in range(3): 165 165 abbrev = model[:-i] if i else model 166 166 tried.append(abbrev) 167 - for mcode in microcodes.values(): 167 + for mcode in list(microcodes.values()): 168 168 if mcode.model.startswith(abbrev): 169 169 found.append(mcode) 170 170 if found: ··· 229 229 args += [mcode.words[i] for i in range(7)] 230 230 args.append(words) 231 231 if outfile == '-': 232 - print out % tuple(args) 232 + print(out % tuple(args)) 233 233 else: 234 234 if not outfile: 235 235 if not os.path.exists(MICROCODE_DIR): 236 - print >> sys.stderr, "Creating directory '%s'" % MICROCODE_DIR 236 + print("Creating directory '%s'" % MICROCODE_DIR, file=sys.stderr) 237 237 os.makedirs(MICROCODE_DIR) 238 238 outfile = os.path.join(MICROCODE_DIR, mcode.name + '.dtsi') 239 - print >> sys.stderr, "Writing microcode for '%s' to '%s'" % ( 240 - ', '.join([mcode.name for mcode in mcodes]), outfile) 239 + print("Writing microcode for '%s' to '%s'" % ( 240 + ', '.join([mcode.name for mcode in mcodes]), outfile), file=sys.stderr) 241 241 with open(outfile, 'w') as fd: 242 - print >> fd, out % tuple(args) 242 + print(out % tuple(args), file=fd) 243 243 244 244 def MicrocodeTool(): 245 245 """Run the microcode tool""" ··· 289 289 if cmd == 'list': 290 290 List(date, microcodes, options.model) 291 291 elif cmd == 'license': 292 - print '\n'.join(license_text) 292 + print('\n'.join(license_text)) 293 293 elif cmd == 'create': 294 294 if not options.model: 295 295 parser.error('You must specify a model to create') 296 296 model = options.model.lower() 297 297 if options.model == 'all': 298 298 options.multiple = True 299 - mcode_list = microcodes.values() 299 + mcode_list = list(microcodes.values()) 300 300 tried = [] 301 301 else: 302 302 mcode_list, tried = FindMicrocode(microcodes, model)