From 6560911df26d5c0d2e1bfef2ec9448bf1f50f24a Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 29 Nov 2019 17:12:08 +0100 Subject: [PATCH] Integrate with latest yosys changes --- litex/build/xilinx/ise.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/litex/build/xilinx/ise.py b/litex/build/xilinx/ise.py index 1d0e244a..768a37b8 100644 --- a/litex/build/xilinx/ise.py +++ b/litex/build/xilinx/ise.py @@ -85,9 +85,9 @@ def _run_yosys(device, sources, vincpaths, build_name): for filename, language, library in sources: ys_contents += "read_{}{} {}\n".format(language, incflags, filename) - ys_contents += """hierarchy -check -top top -proc; memory; opt; fsm; opt -synth_xilinx -top top -edif {build_name}.edif""".format(build_name=build_name) + ys_contents += """hierarchy -top top +synth_xilinx -top top -family xc6s -ise +write_edif -pvector bra {build_name}.edif""".format(build_name=build_name) ys_name = build_name + ".ys" tools.write_to_file(ys_name, ys_contents) @@ -114,7 +114,10 @@ def _run_ise(build_name, ise_path, source, mode, ngdbuild_opt, settings = common.settings(ise_path, ver, "ISE_DS") build_script_contents += source_cmd + tools.cygpath(settings) + "\n" if mode == "edif": - ext = "edif" + ext = "ngo" + build_script_contents += """ +edif2ngd {build_name}.edif {build_name}.{ext}{fail_stmt} +""" else: ext = "ngc" build_script_contents += """ @@ -207,7 +210,8 @@ class XilinxISEToolchain: _build_xst_files(platform.device, platform.sources, platform.verilog_include_paths, build_name, self.xst_opt) isemode = mode else: - _run_yosys(platform.device, platform.sources, platform.verilog_include_paths, build_name) + if run: + _run_yosys(platform.device, platform.sources, platform.verilog_include_paths, build_name) isemode = "edif" ngdbuild_opt += "-p " + platform.device -- 2.30.2