Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #483 from ilya-epifanov/lattice-openocd-jtag-programmer-erase-flag-and-quiet-output 

Lattice OpenOCD JTAG programmer: removed erase flag and made progress output less noisy
This commit is contained in:
enjoy-digital 2020-05-01 21:18:09 +02:00 committed by GitHub
parent a6779b9d61 a11f1c39b7
commit e853cac6b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
litex/build/lattice/programmer.py
View File

@ -32,28 +32,23 @@ class OpenOCDJTAGProgrammer(GenericProgrammer):
def load_bitstream(self, bitstream_file): def load_bitstream(self, bitstream_file):
svf_file = bitstream_file.replace(".bit", ".svf") svf_file = bitstream_file.replace(".bit", ".svf")
subprocess.call(["openocd", "-f", self.openocd_config , "-c", "transport select jtag; init; svf \"{}\"; exit".format(svf_file)]) subprocess.call(["openocd", "-f", self.openocd_config , "-c", "transport select jtag; init; svf quiet progress \"{}\"; exit".format(svf_file)])
def flash(self, address, data, erase=False, verify=True): def flash(self, address, data, verify=True):
if self.flash_proxy_basename is None: if self.flash_proxy_basename is None:
flash_proxy = None flash_proxy = None
else: else:
flash_proxy = self.find_flash_proxy() flash_proxy = self.find_flash_proxy()
if erase:
erase = "erase"
else:
erase = ""
script = "; ".join([ script = "; ".join([
"transport select jtag", "transport select jtag",
"target create ecp5.spi0.proxy testee -chain-position ecp5.tap", "target create ecp5.spi0.proxy testee -chain-position ecp5.tap",
"flash bank spi0 jtagspi 0 0 0 0 ecp5.spi0.proxy 0x32", "flash bank spi0 jtagspi 0 0 0 0 ecp5.spi0.proxy 0x32",
"init", "init",
"svf \"{}\"" if flash_proxy is not None else "".format(flash_proxy), "svf quiet progress \"{}\"".format(flash_proxy) if flash_proxy is not None else "",
"reset halt", "reset halt",
"flash probe spi0", "flash probe spi0",
"flash write_image {0} \"{1}\" 0x{2:x}".format(erase, data, address), "flash write_image erase \"{0}\" 0x{1:x}".format(data, address),
"flash verify_bank spi0 \"{0}\" 0x{1:x}" if verify else "".format(data, address), "flash verify_bank spi0 \"{0}\" 0x{1:x}" if verify else "".format(data, address),
"exit" "exit"
]) ])