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: basecfg now integrated in nextpnr

This commit is contained in:
Florent Kermarrec 2019-03-01 14:20:00 +01:00
parent 7e995eb418
commit 1b34c07da9
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
litex/build/lattice/trellis.py
View File

@ -60,7 +60,7 @@ def _build_lpf(named_sc, named_pc):
def _build_script(source, build_template, build_name, architecture, def _build_script(source, build_template, build_name, architecture,
basecfg, freq_constraint): freq_constraint):
if sys.platform in ("win32", "cygwin"): if sys.platform in ("win32", "cygwin"):
script_ext = ".bat" script_ext = ".bat"
build_script_contents = "@echo off\nrem Autogenerated by Migen\n\n" build_script_contents = "@echo off\nrem Autogenerated by Migen\n\n"
@ -74,7 +74,6 @@ def _build_script(source, build_template, build_name, architecture,
s_fail = s + "{fail_stmt}\n" # Required so Windows scripts fail early. s_fail = s + "{fail_stmt}\n" # Required so Windows scripts fail early.
build_script_contents += s_fail.format(build_name=build_name, build_script_contents += s_fail.format(build_name=build_name,
architecture=architecture, architecture=architecture,
basecfg=basecfg,
freq_constraint=freq_constraint, freq_constraint=freq_constraint,
fail_stmt=fail_stmt) fail_stmt=fail_stmt)
@ -130,7 +129,7 @@ class LatticeTrellisToolchain:
self.build_template = [ self.build_template = [
"yosys -q -l {build_name}.rpt {build_name}.ys", "yosys -q -l {build_name}.rpt {build_name}.ys",
"nextpnr-ecp5 --json {build_name}.json --lpf {build_name}.lpf --textcfg {build_name}.config --basecfg {basecfg} --{architecture} --freq {freq_constraint}", "nextpnr-ecp5 --json {build_name}.json --lpf {build_name}.lpf --textcfg {build_name}.config --{architecture} --freq {freq_constraint}",
"ecppack {build_name}.config {build_name}.bit" "ecppack {build_name}.config {build_name}.bit"
] ]
@ -166,16 +165,14 @@ class LatticeTrellisToolchain:
for _ in self.yosys_template) for _ in self.yosys_template)
tools.write_to_file(yosys_script_file, yosys_script_contents) tools.write_to_file(yosys_script_file, yosys_script_contents)
# transform platform.device to nextpnr's architecture / basecfg # transform platform.device to nextpnr's architecture
(family, size, package) = platform.device.split("-") (family, size, package) = platform.device.split("-")
architecture = nextpnr_ecp5_architectures[(family + "-" + size).lower()] architecture = nextpnr_ecp5_architectures[(family + "-" + size).lower()]
basecfg = "empty_" + (family + "-" + size).lower() + ".config"
basecfg = os.path.join(toolchain_path, "misc", "basecfgs", basecfg)
freq_constraint = str(max(self.freq_constraints.values(), freq_constraint = str(max(self.freq_constraints.values(),
default=0.0)) default=0.0))
script = _build_script(False, self.build_template, build_name, script = _build_script(False, self.build_template, build_name,
architecture, basecfg, freq_constraint) architecture, freq_constraint)
# run scripts # run scripts
if run: if run: