vendor: `yosys` is not a required tool for proprietary toolchains.

Since commit b9799b4c, the discovery mechanism for the Yosys required
to produce Verilog is different from the usual require_tool(); namely
it is possible to produce Verilog without a `yosys` binary on PATH.

Fixes #419.

diff --git a/nmigen/vendor/lattice_ecp5.py b/nmigen/vendor/lattice_ecp5.py
index cfa20eea22b88a0e969ad6f168c0b501592402be..c1a1366148903e3ac3d0deaf8bbf691681cecfc7 100644 (file)
--- a/nmigen/vendor/lattice_ecp5.py
+++ b/nmigen/vendor/lattice_ecp5.py
@@ -176,7 +176,6 @@ class LatticeECP5Platform(TemplatedPlatform):
     # Diamond templates
 
     _diamond_required_tools = [
-        "yosys",
         "pnmainc",
         "ddtcmd"
     ]

diff --git a/nmigen/vendor/lattice_ice40.py b/nmigen/vendor/lattice_ice40.py
index fcfa1c0ffdc8754a7866bbda615886a9201f7aec..da490a8366ca259acbd3aec1f87cc169446ab03c 100644 (file)
--- a/nmigen/vendor/lattice_ice40.py
+++ b/nmigen/vendor/lattice_ice40.py
@@ -172,7 +172,6 @@ class LatticeICE40Platform(TemplatedPlatform):
     # iCECube2 templates
 
     _icecube2_required_tools = [
-        "yosys",
         "synthesis",
         "synpwrap",
         "tclsh",

diff --git a/nmigen/vendor/lattice_machxo_2_3l.py b/nmigen/vendor/lattice_machxo_2_3l.py
index 0eb348e10187db4dd4c6c8dfe47d7619dad61443..b94d26dc01b7913b87a62403189af5006d1dfc5d 100644 (file)
--- a/nmigen/vendor/lattice_machxo_2_3l.py
+++ b/nmigen/vendor/lattice_machxo_2_3l.py
@@ -39,7 +39,6 @@ class LatticeMachXO2Or3LPlatform(TemplatedPlatform):
     grade   = "C" # [C]ommercial, [I]ndustrial
 
     required_tools = [
-        "yosys",
         "pnmainc",
         "ddtcmd"
     ]

diff --git a/nmigen/vendor/xilinx_7series.py b/nmigen/vendor/xilinx_7series.py
index c9b44f140fbec7014a30fb86f3cdd1d1084f27c0..0bf542444db624c5eed9971e300ece9e4b5c24c4 100644 (file)
--- a/nmigen/vendor/xilinx_7series.py
+++ b/nmigen/vendor/xilinx_7series.py
@@ -53,10 +53,7 @@ class Xilinx7SeriesPlatform(TemplatedPlatform):
     speed   = abstractproperty()
     grade   = None
 
-    required_tools = [
-        "yosys",
-        "vivado"
-    ]
+    required_tools = ["vivado"]
     file_templates = {
         **TemplatedPlatform.build_script_templates,
         "build_{{name}}.sh": r"""

diff --git a/nmigen/vendor/xilinx_spartan_3_6.py b/nmigen/vendor/xilinx_spartan_3_6.py
index a4b4d999db97e617278971a97db5c2d7e262a402..0de16d272e615f42e1e11b426f96e3b14421b857 100644 (file)
--- a/nmigen/vendor/xilinx_spartan_3_6.py
+++ b/nmigen/vendor/xilinx_spartan_3_6.py
@@ -59,7 +59,6 @@ class XilinxSpartan3Or6Platform(TemplatedPlatform):
     speed   = abstractproperty()
 
     required_tools = [
-        "yosys",
         "xst",
         "ngdbuild",
         "map",

diff --git a/nmigen/vendor/xilinx_ultrascale.py b/nmigen/vendor/xilinx_ultrascale.py
index c1442296b7146a52cba06d6bb2cbeb90b16b1b36..6f905177260027cc5485097bbbccde5b9812688d 100644 (file)
--- a/nmigen/vendor/xilinx_ultrascale.py
+++ b/nmigen/vendor/xilinx_ultrascale.py
@@ -53,10 +53,7 @@ class XilinxUltraScalePlatform(TemplatedPlatform):
     speed   = abstractproperty()
     grade   = None
 
-    required_tools = [
-        "yosys",
-        "vivado"
-    ]
+    required_tools = ["vivado"]
     file_templates = {
         **TemplatedPlatform.build_script_templates,
         "build_{{name}}.sh": r"""