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 #481 from betrusted-io/unfstringify 

propose patch to not break litex for python 3.5
This commit is contained in:
enjoy-digital 2020-04-28 19:05:08 +02:00 committed by GitHub
parent 56aa7897df 17b766546b
commit 855d614e5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ 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", f"transport select jtag; init; svf \"{svf_file}\"; exit"]) subprocess.call(["openocd", "-f", self.openocd_config , "-c", "transport select jtag; init; svf \"{}\"; exit".format(svf_file)])
def flash(self, address, data, erase=False, verify=True): def flash(self, address, data, erase=False, verify=True):
if self.flash_proxy_basename is None: if self.flash_proxy_basename is None:
@ -50,11 +50,11 @@ class OpenOCDJTAGProgrammer(GenericProgrammer):
"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",
f"svf \"{flash_proxy}\"" if flash_proxy is not None else "", "svf \"{}\"" if flash_proxy is not None else "".format(flash_proxy),
"reset halt", "reset halt",
"flash probe spi0", "flash probe spi0",
f"flash write_image {erase} \"{data}\" 0x{address:x}", "flash write_image {0} \"{1}\" 0x{2:x}".format(erase, data, address),
f"flash verify_bank spi0 \"{data}\" 0x{address:x}" if verify else "", "flash verify_bank spi0 \"{0}\" 0x{1:x}" if verify else "".format(data, address),
"exit" "exit"
]) ])
subprocess.call(["openocd", "-f", self.openocd_config, "-c", script]) subprocess.call(["openocd", "-f", self.openocd_config, "-c", script])