move programmer to mibuild

This commit is contained in:
Florent Kermarrec 2014-07-31 18:17:32 +02:00 committed by Sebastien Bourdeauducq
parent 25b3aff6f1
commit 62c9043d07
1 changed files with 3 additions and 2 deletions

View File

@ -8,7 +8,6 @@ from migen.fhdl import simplify
from misoclib.gensoc import cpuif from misoclib.gensoc import cpuif
from misoclib.sdramphy import initsequence from misoclib.sdramphy import initsequence
import programmer
def _get_args(): def _get_args():
parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter,
@ -198,10 +197,12 @@ CPU type: {}
platform.build(soc, build_name=build_name, **build_kwargs) platform.build(soc, build_name=build_name, **build_kwargs)
if actions["load-bitstream"] or actions["flash-bitstream"] or actions["flash-bios"]: if actions["load-bitstream"] or actions["flash-bitstream"] or actions["flash-bios"]:
prog = programmer.create_programmer(platform.name, args.flash_proxy_dir) prog = platform.create_programmer()
if actions["load-bitstream"]: if actions["load-bitstream"]:
prog.load_bitstream("build/" + build_name + platform.bitstream_ext) prog.load_bitstream("build/" + build_name + platform.bitstream_ext)
if actions["flash-bitstream"]: if actions["flash-bitstream"]:
if prog.needs_flash_proxy:
prog.set_flash_proxy_dir(args.flash_proxy_dir)
if prog.needs_bitreverse: if prog.needs_bitreverse:
flashbit = "build/" + build_name + ".fpg" flashbit = "build/" + build_name + ".fpg"
subprocess.call(["tools/byteswap", subprocess.call(["tools/byteswap",