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

build/lattice/trellis: set default spimode to None (--spimode not passed to ecppack) as default instead of fast-read. 

Using fast-read as default prevent loading the .bit via JTAG (see #589).
This commit is contained in:
Florent Kermarrec 2020-07-13 11:55:03 +02:00
parent ae3c78f6d1
commit 6671eb6218
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/trellis.py
View File

@ -118,7 +118,7 @@ _build_template = [
"yosys -l {build_name}.rpt {build_name}.ys", "yosys -l {build_name}.rpt {build_name}.ys",
"nextpnr-ecp5 --json {build_name}.json --lpf {build_name}.lpf --textcfg {build_name}.config \ "nextpnr-ecp5 --json {build_name}.json --lpf {build_name}.lpf --textcfg {build_name}.config \
--{architecture} --package {package} --speed {speed_grade} {timefailarg} {ignoreloops} --seed {seed}", --{architecture} --package {package} --speed {speed_grade} {timefailarg} {ignoreloops} --seed {seed}",
"ecppack {build_name}.config --svf {build_name}.svf --bit {build_name}.bit --bootaddr {bootaddr} --spimode {spimode}" "ecppack {build_name}.config --svf {build_name}.svf --bit {build_name}.bit --bootaddr {bootaddr} {spimode}"
] ]
def _build_script(source, build_template, build_name, architecture, package, speed_grade, timingstrict, ignoreloops, bootaddr, seed, spimode): def _build_script(source, build_template, build_name, architecture, package, speed_grade, timingstrict, ignoreloops, bootaddr, seed, spimode):
@ -143,7 +143,7 @@ def _build_script(source, build_template, build_name, architecture, package, spe
bootaddr = bootaddr, bootaddr = bootaddr,
fail_stmt = fail_stmt, fail_stmt = fail_stmt,
seed = seed, seed = seed,
spimode = spimode) spimode = "" if spimode is None else "--spimode {}".format(spimode))
script_file = "build_" + build_name + script_ext script_file = "build_" + build_name + script_ext
tools.write_to_file(script_file, script_contents, force_unix=False) tools.write_to_file(script_file, script_contents, force_unix=False)
@ -191,7 +191,7 @@ class LatticeTrellisToolchain:
ignoreloops = False, ignoreloops = False,
bootaddr = 0, bootaddr = 0,
seed = 1, seed = 1,
spimode = "fast-read", spimode = None,
**kwargs): **kwargs):
# Create build directory # Create build directory
@ -251,7 +251,7 @@ def trellis_args(parser):
help="ignore combinational loops in timing analysis, i.e. pass '--ignore-loops' to nextpnr") help="ignore combinational loops in timing analysis, i.e. pass '--ignore-loops' to nextpnr")
parser.add_argument("--ecppack-bootaddr", default=0, parser.add_argument("--ecppack-bootaddr", default=0,
help="Set boot address for next image, i.e. pass '--bootaddr xxx' to ecppack") help="Set boot address for next image, i.e. pass '--bootaddr xxx' to ecppack")
parser.add_argument("--ecppack-spimode", default="fast-read", parser.add_argument("--ecppack-spimode", default=None,
help="Set slave SPI programming mode") help="Set slave SPI programming mode")
parser.add_argument("--nextpnr-seed", default=1, type=int, parser.add_argument("--nextpnr-seed", default=1, type=int,
help="seed to pass to nextpnr") help="seed to pass to nextpnr")