Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/migen
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 44e5c689c767
Choose a base ref
...
head repository: m-labs/migen
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 56aac3130473
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Nov 4, 2015

  1. build/ise: make method default args consistent across platforms

    @sbourdeauducq
    sbourdeauducq committed Nov 4, 2015
    Copy the full SHA
    5c30962 View commit details

  2. build: standardize toolchain path setting

    @sbourdeauducq
    sbourdeauducq committed Nov 4, 2015
    Copy the full SHA
    56aac31 View commit details
Showing with 18 additions and 23 deletions.
  1. +2 −2 migen/build/altera/quartus.py
  2. +2 −2 migen/build/lattice/diamond.py
  3. +12 −17 migen/build/xilinx/ise.py
  4. +2 −2 migen/build/xilinx/vivado.py
4 changes: 2 additions & 2 deletions migen/build/altera/quartus.py
View file
Original file line number Diff line number Diff line change
@@ -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("..")

4 changes: 2 additions & 2 deletions migen/build/lattice/diamond.py
View file
Original file line number Diff line number Diff line change
@@ -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("..")

29 changes: 12 additions & 17 deletions migen/build/xilinx/ise.py
View file
Original file line number Diff line number Diff line change
@@ -122,19 +122,6 @@ def _run_ise(build_name, ise_path, source, mode, ngdbuild_opt,
raise OSError("Subprocess failed")


def _default_ise_path():
if sys.platform == "win32":
return "C:\\Xilinx"
elif sys.platform == "cygwin":
return "/cygdrive/c/Xilinx"
else:
return "/opt/Xilinx"


def _default_source():
return sys.platform != "win32"


class XilinxISEToolchain:
def __init__(self):
self.xst_opt = """-ifmt MIXED
@@ -148,13 +135,21 @@ def __init__(self):
self.ise_commands = ""

def build(self, platform, fragment, build_dir="build", build_name="top",
ise_path=_default_ise_path(), source=_default_source(), run=True, mode="xst"):
toolchain_path=None, source=None, run=True, mode="xst"):
if not isinstance(fragment, _Fragment):
fragment = fragment.get_fragment()
platform.finalize(fragment)
if toolchain_path is None:
if sys.platform == "win32":
toolchain_path = "C:\\Xilinx"
elif sys.platform == "cygwin":
toolchain_path = "/cygdrive/c/Xilinx"
else:
toolchain_path = "/opt/Xilinx"
if source is None:
source = sys.platform != "win32"

platform.finalize(fragment)
ngdbuild_opt = self.ngdbuild_opt

vns = None

tools.mkdir_noerror(build_dir)
@@ -190,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:
4 changes: 2 additions & 2 deletions migen/build/xilinx/vivado.py
View file
Original file line number Diff line number Diff line change
@@ -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("..")