From 17b766546b784c023ce9e1e79cfc2af3a379ff34 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 29 Apr 2020 00:34:19 +0800 Subject: [PATCH] propose patch to not break litex for python 3.5 --- litex/build/lattice/programmer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/litex/build/lattice/programmer.py b/litex/build/lattice/programmer.py index addc51dcf..c97bb07b0 100644 --- a/litex/build/lattice/programmer.py +++ b/litex/build/lattice/programmer.py @@ -32,7 +32,7 @@ class OpenOCDJTAGProgrammer(GenericProgrammer): def load_bitstream(self, bitstream_file): 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): if self.flash_proxy_basename is None: @@ -50,11 +50,11 @@ class OpenOCDJTAGProgrammer(GenericProgrammer): "target create ecp5.spi0.proxy testee -chain-position ecp5.tap", "flash bank spi0 jtagspi 0 0 0 0 ecp5.spi0.proxy 0x32", "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", "flash probe spi0", - f"flash write_image {erase} \"{data}\" 0x{address:x}", - f"flash verify_bank spi0 \"{data}\" 0x{address:x}" if verify else "", + "flash write_image {0} \"{1}\" 0x{2:x}".format(erase, data, address), + "flash verify_bank spi0 \"{0}\" 0x{1:x}" if verify else "".format(data, address), "exit" ]) subprocess.call(["openocd", "-f", self.openocd_config, "-c", script])