From 9210df9e9fe5f361e9eb1b12f1d4dd15b26e7ef8 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Wed, 19 Aug 2015 01:09:54 +0200 Subject: [PATCH] mibuild/xilinx/ise: update synthesis with yosis --- mibuild/xilinx/ise.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/mibuild/xilinx/ise.py b/mibuild/xilinx/ise.py index d440839e1..92f37517d 100644 --- a/mibuild/xilinx/ise.py +++ b/mibuild/xilinx/ise.py @@ -69,24 +69,12 @@ def _run_yosys(device, sources, vincpaths, build_name): incflags = "" for path in vincpaths: incflags += " -I" + path - for filename, language in sources: + for filename, language, library in sources: ys_contents += "read_{}{} {}\n".format(language, incflags, filename) - if device[:2] == "xc": - archcode = device[2:4] - else: - archcode = device[0:2] - arch = { - "6s": "spartan6", - "7a": "artix7", - "7k": "kintex7", - "7v": "virtex7", - "7z": "zynq7000" - }[archcode] - ys_contents += """hierarchy -check -top top proc; memory; opt; fsm; opt -synth_xilinx -arch {arch} -top top -edif {build_name}.edif""".format(arch=arch, build_name=build_name) +synth_xilinx -top top -edif {build_name}.edif""".format(build_name=build_name) ys_name = build_name + ".ys" tools.write_to_file(ys_name, ys_contents)