build: standardize toolchain path setting

m-labs · Nov 4, 2015 · 56aac31 · 56aac31
1 parent 5c30962
commit 56aac31
Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/migen/build/altera/quartus.py b/migen/build/altera/quartus.py
@@ -113,7 +113,7 @@ def _run_quartus(build_name, quartus_path):
 
 class AlteraQuartusToolchain:
     def build(self, platform, fragment, build_dir="build", build_name="top",
-              quartus_path="/opt/Altera", run=True):
+              toolchain_path="/opt/Altera", run=True):
         tools.mkdir_noerror(build_dir)
         os.chdir(build_dir)
 
@@ -133,7 +133,7 @@ def build(self, platform, fragment, build_dir="build", build_name="top",
                      named_pc,
                      build_name)
         if run:
-            _run_quartus(build_name, quartus_path)
+            _run_quartus(build_name, toolchain_path)
 
         os.chdir("..")
 

diff --git a/migen/build/lattice/diamond.py b/migen/build/lattice/diamond.py
@@ -76,7 +76,7 @@ def _run_diamond(build_name, source, ver=None):
 
 class LatticeDiamondToolchain:
     def build(self, platform, fragment, build_dir="build", build_name="top",
-            diamond_path="/opt/Diamond", run=True):
+              toolchain_path="/opt/Diamond", run=True):
         tools.mkdir_noerror(build_dir)
         os.chdir(build_dir)
 
@@ -94,7 +94,7 @@ def build(self, platform, fragment, build_dir="build", build_name="top",
         tools.write_to_file(build_name + ".lpf", _build_lpf(named_sc, named_pc))
 
         if run:
-            _run_diamond(build_name, diamond_path)
+            _run_diamond(build_name, toolchain_path)
 
         os.chdir("..")
 

diff --git a/migen/build/xilinx/ise.py b/migen/build/xilinx/ise.py
@@ -135,16 +135,16 @@ def __init__(self):
         self.ise_commands = ""
 
     def build(self, platform, fragment, build_dir="build", build_name="top",
-            ise_path=None, source=None, run=True, mode="xst"):
+            toolchain_path=None, source=None, run=True, mode="xst"):
         if not isinstance(fragment, _Fragment):
             fragment = fragment.get_fragment()
-        if ise_path is None:
+        if toolchain_path is None:
             if sys.platform == "win32":
-                ise_path = "C:\\Xilinx"
+                toolchain_path = "C:\\Xilinx"
             elif sys.platform == "cygwin":
-                ise_path = "/cygdrive/c/Xilinx"
+                toolchain_path = "/cygdrive/c/Xilinx"
             else:
-                ise_path = "/opt/Xilinx"
+                toolchain_path = "/opt/Xilinx"
         if source is None:
             source = sys.platform != "win32"
 
@@ -185,7 +185,7 @@ def build(self, platform, fragment, build_dir="build", build_name="top",
 
             tools.write_to_file(build_name + ".ucf", _build_ucf(named_sc, named_pc))
             if run:
-                _run_ise(build_name, ise_path, source, isemode,
+                _run_ise(build_name, toolchain_path, source, isemode,
                          ngdbuild_opt, self.bitgen_opt, self.ise_commands,
                          self.map_opt, self.par_opt)
         finally:

diff --git a/migen/build/xilinx/vivado.py b/migen/build/xilinx/vivado.py
@@ -112,7 +112,7 @@ def _build_batch(self, platform, sources, build_name):
         tools.write_to_file(build_name + ".tcl", "\n".join(tcl))
 
     def build(self, platform, fragment, build_dir="build", build_name="top",
-            vivado_path="/opt/Xilinx/Vivado", source=True, run=True):
+            toolchain_path="/opt/Xilinx/Vivado", source=True, run=True):
         tools.mkdir_noerror(build_dir)
         os.chdir(build_dir)
 
@@ -127,7 +127,7 @@ def build(self, platform, fragment, build_dir="build", build_name="top",
         self._build_batch(platform, sources, build_name)
         tools.write_to_file(build_name + ".xdc", _build_xdc(named_sc, named_pc))
         if run:
-            _run_vivado(build_name, vivado_path, source)
+            _run_vivado(build_name, toolchain_path, source)
 
         os.chdir("..")