From: Florent Kermarrec Date: Tue, 10 Nov 2015 11:01:25 +0000 (+0100) Subject: litex/build/xilinx/programmer: remove UrJTAG and Adept X-Git-Tag: 24jan2021_ls180~2094 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=85e6716b6b83384bf04ef7e65613d7db0467ded6;p=litex.git litex/build/xilinx/programmer: remove UrJTAG and Adept --- diff --git a/litex/build/xilinx/programmer.py b/litex/build/xilinx/programmer.py index 47b76fce..466cee57 100644 --- a/litex/build/xilinx/programmer.py +++ b/litex/build/xilinx/programmer.py @@ -6,42 +6,6 @@ from litex.build.generic_programmer import GenericProgrammer from litex.build.xilinx import common -def _run_urjtag(cmds): - with subprocess.Popen("jtag", stdin=subprocess.PIPE) as process: - process.stdin.write(cmds.encode("ASCII")) - process.communicate() - - -class UrJTAG(GenericProgrammer): - needs_bitreverse = True - - def __init__(self, cable, flash_proxy_basename=None): - GenericProgrammer.__init__(self, flash_proxy_basename) - self.cable = cable - - def load_bitstream(self, bitstream_file): - cmds = """cable {cable} -detect -pld load {bitstream} -quit -""".format(bitstream=bitstream_file, cable=self.cable) - _run_urjtag(cmds) - - def flash(self, address, data_file): - flash_proxy = self.find_flash_proxy() - cmds = """cable {cable} -detect -pld load "{flash_proxy}" -initbus fjmem opcode=000010 -frequency 6000000 -detectflash 0 -endian big -flashmem "{address}" "{data_file}" noverify -""".format(flash_proxy=flash_proxy, address=address, data_file=data_file, - cable=self.cable) - _run_urjtag(cmds) - - class XC3SProg(GenericProgrammer): needs_bitreverse = False @@ -172,30 +136,3 @@ endgroup quit """.format(data=data_file, flash_part=self.flash_part) _run_vivado(self.vivado_path, self.vivado_ver, cmds) - - -class Adept(GenericProgrammer): - """Using the Adept tool with an onboard Digilent "USB JTAG" cable. - - You need to install Adept Utilities V2 from - http://www.digilentinc.com/Products/Detail.cfm?NavPath=2,66,828&Prod=ADEPT2 - """ - - needs_bitreverse = False - - def __init__(self, board, index, flash_proxy_basename=None): - GenericProgrammer.__init__(self, flash_proxy_basename) - self.board = board - self.index = index - - def load_bitstream(self, bitstream_file): - subprocess.call([ - "djtgcfg", - "--verbose", - "prog", "-d", self.board, - "-i", str(self.index), - "-f", bitstream_file, - ]) - - def flash(self, address, data_file): - raise ValueError("Flashing unsupported with DigilentAdept tools")