diff --git a/litex/build/lattice/trellis.py b/litex/build/lattice/trellis.py index 38e4cdaeb..34c8e6db4 100644 --- a/litex/build/lattice/trellis.py +++ b/litex/build/lattice/trellis.py @@ -118,10 +118,10 @@ _build_template = [ "yosys -l {build_name}.rpt {build_name}.ys", "nextpnr-ecp5 --json {build_name}.json --lpf {build_name}.lpf --textcfg {build_name}.config \ --{architecture} --package {package} --speed {speed_grade} {timefailarg} {ignoreloops} --seed {seed}", - "ecppack {build_name}.config --svf {build_name}.svf --bit {build_name}.bit" + "ecppack {build_name}.config --svf {build_name}.svf --bit {build_name}.bit --bootaddr {bootaddr}" ] -def _build_script(source, build_template, build_name, architecture, package, speed_grade, timingstrict, ignoreloops, seed): +def _build_script(source, build_template, build_name, architecture, package, speed_grade, timingstrict, ignoreloops, bootaddr, seed): if sys.platform in ("win32", "cygwin"): script_ext = ".bat" script_contents = "@echo off\nrem Autogenerated by LiteX / git: " + tools.get_litex_git_revision() + "\n\n" @@ -134,14 +134,15 @@ def _build_script(source, build_template, build_name, architecture, package, spe for s in build_template: s_fail = s + "{fail_stmt}\n" # Required so Windows scripts fail early. script_contents += s_fail.format( - build_name = build_name, - architecture = architecture, - package = package, - speed_grade = speed_grade, - timefailarg = "--timing-allow-fail" if not timingstrict else "", - ignoreloops = "--ignore-loops" if ignoreloops else "", - fail_stmt = fail_stmt, - seed = seed) + build_name = build_name, + architecture = architecture, + package = package, + speed_grade = speed_grade, + timefailarg = "--timing-allow-fail" if not timingstrict else "", + ignoreloops = "--ignore-loops" if ignoreloops else "", + bootaddr = bootaddr, + fail_stmt = fail_stmt, + seed = seed) script_file = "build_" + build_name + script_ext tools.write_to_file(script_file, script_contents, force_unix=False) @@ -187,6 +188,7 @@ class LatticeTrellisToolchain: nowidelut = False, timingstrict = False, ignoreloops = False, + bootaddr = 0, seed = 1, **kwargs): @@ -219,8 +221,7 @@ class LatticeTrellisToolchain: # Generate build script script = _build_script(False, self.build_template, build_name, architecture, package, - speed_grade, timingstrict, ignoreloops, seed) - + speed_grade, timingstrict, ignoreloops, bootaddr, seed) # Run if run: _run_script(script) @@ -246,6 +247,8 @@ def trellis_args(parser): help="fail if timing not met, i.e., do NOT pass '--timing-allow-fail' to nextpnr") parser.add_argument("--nextpnr-ignoreloops", action="store_true", help="ignore combinational loops in timing analysis, i.e. pass '--ignore-loops' to nextpnr") + parser.add_argument("--ecppack-bootaddr", default=0, + help="Set boot address for next image, i.e. pass '--bootaddr xxx' to ecppack") parser.add_argument("--nextpnr-seed", default=1, type=int, help="seed to pass to nextpnr") @@ -254,5 +257,6 @@ def trellis_argdict(args): "nowidelut": args.yosys_nowidelut, "timingstrict": args.nextpnr_timingstrict, "ignoreloops": args.nextpnr_ignoreloops, + "bootaddr": args.ecppack_bootaddr, "seed": args.nextpnr_seed, }