From 746886ca8ac3b9a8941b540a347452805acbbcf2 Mon Sep 17 00:00:00 2001 From: nickoe Date: Sun, 31 Jan 2021 19:08:44 +0100 Subject: [PATCH] vendor.xilinx_7series: fix tool names for symbiflow. Prefix "tools" with symbiflow_ as is done for the QuickLogic Symbiflow toolchain. Installing symbiflow gives me the tools with the preifx, so I guess this is the correct way to move forward. --- nmigen/vendor/xilinx_7series.py | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/nmigen/vendor/xilinx_7series.py b/nmigen/vendor/xilinx_7series.py index e53a7a4..c0f7dae 100644 --- a/nmigen/vendor/xilinx_7series.py +++ b/nmigen/vendor/xilinx_7series.py @@ -52,12 +52,12 @@ class Xilinx7SeriesPlatform(TemplatedPlatform): ------------------- Required tools: - * ``synth`` - * ``pack`` - * ``place`` - * ``route`` - * ``write_fasm`` - * ``write_bitstream`` + * ``symbiflow_synth`` + * ``symbiflow_pack`` + * ``symbiflow_place`` + * ``symbiflow_route`` + * ``symbiflow_write_fasm`` + * ``symbiflow_write_bitstream`` The environment is populated by running the script specified in the environment variable ``NMIGEN_ENV_Symbiflow``, if present. @@ -183,12 +183,12 @@ class Xilinx7SeriesPlatform(TemplatedPlatform): } _symbiflow_required_tools = [ - "synth", - "pack", - "place", - "route", - "write_fasm", - "write_bitstream" + "symbiflow_synth", + "symbiflow_pack", + "symbiflow_place", + "symbiflow_route", + "symbiflow_write_fasm", + "symbiflow_write_bitstream" ] _symbiflow_file_templates = { **TemplatedPlatform.build_script_templates, @@ -226,20 +226,20 @@ class Xilinx7SeriesPlatform(TemplatedPlatform): } _symbiflow_command_templates = [ r""" - {{invoke_tool("synth")}} + {{invoke_tool("symbiflow_synth")}} -t {{name}} -v {% for file in platform.iter_files(".v", ".sv", ".vhd", ".vhdl") -%} {{file}} {% endfor %} {{name}}.v -p {{platform._symbiflow_part_map.get(platform._part, platform._part)}} -x {{name}}.xdc """, r""" - {{invoke_tool("pack")}} + {{invoke_tool("symbiflow_pack")}} -e {{name}}.eblif -P {{platform._symbiflow_part_map.get(platform._part, platform._part)}} -s {{name}}.sdc """, r""" - {{invoke_tool("place")}} + {{invoke_tool("symbiflow_place")}} -e {{name}}.eblif -p {{name}}.pcf -n {{name}}.net @@ -247,18 +247,18 @@ class Xilinx7SeriesPlatform(TemplatedPlatform): -s {{name}}.sdc """, r""" - {{invoke_tool("route")}} + {{invoke_tool("symbiflow_route")}} -e {{name}}.eblif -P {{platform._symbiflow_part_map.get(platform._part, platform._part)}} -s {{name}}.sdc """, r""" - {{invoke_tool("write_fasm")}} + {{invoke_tool("symbiflow_write_fasm")}} -e {{name}}.eblif -P {{platform._symbiflow_part_map.get(platform._part, platform._part)}} """, r""" - {{invoke_tool("write_bitstream")}} + {{invoke_tool("symbiflow_write_bitstream")}} -f {{name}}.fasm -p {{platform._symbiflow_part_map.get(platform._part, platform._part)}} -b {{name}}.bit -- 2.30.2