From 56aac31304738766446902aa6a63b72afb53603d Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 4 Nov 2015 14:55:12 +0800 Subject: [PATCH] build: standardize toolchain path setting --- migen/build/altera/quartus.py | 4 ++-- migen/build/lattice/diamond.py | 4 ++-- migen/build/xilinx/ise.py | 12 ++++++------ migen/build/xilinx/vivado.py | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/migen/build/altera/quartus.py b/migen/build/altera/quartus.py index 4b5b8355..99f6e978 100644 --- a/migen/build/altera/quartus.py +++ b/migen/build/altera/quartus.py @@ -113,7 +113,7 @@ quartus_sta {build_name} -c {build_name} 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 @@ class AlteraQuartusToolchain: 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 index 3fae1f2e..1334040b 100644 --- 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 @@ class LatticeDiamondToolchain: 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 index eb64b37d..72e82a90 100644 --- a/migen/build/xilinx/ise.py +++ b/migen/build/xilinx/ise.py @@ -135,16 +135,16 @@ class XilinxISEToolchain: 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 @@ class XilinxISEToolchain: 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 index 76e41d86..c1a54a41 100644 --- a/migen/build/xilinx/vivado.py +++ b/migen/build/xilinx/vivado.py @@ -112,7 +112,7 @@ class XilinxVivadoToolchain: 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 @@ class XilinxVivadoToolchain: 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("..") -- 2.30.2