Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

build/xilinx/vivado: fix merge issue

Browse source
This commit is contained in:
Florent Kermarrec 2018-10-29 08:26:13 +01:00
parent 3e189379f9
commit a73d9d96b1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
litex/build/xilinx/vivado.py
View file

@ -214,8 +214,7 @@ class XilinxVivadoToolchain:
) )
def build(self, platform, fragment, build_dir="build", build_name="top", def build(self, platform, fragment, build_dir="build", build_name="top",
toolchain_path=None, source=True, run=True, **kwargs): toolchain_path=None, source=True, run=True, synth_mode="vivado", **kwargs):
synth_mode = kwargs.get('synth_mode', 'yosys')
if toolchain_path is None: if toolchain_path is None:
if sys.platform == "win32": if sys.platform == "win32":
toolchain_path = "C:\\Xilinx\\Vivado" toolchain_path = "C:\\Xilinx\\Vivado"
@ -244,9 +243,11 @@ class XilinxVivadoToolchain:
if run: if run:
if synth_mode == "yosys": if synth_mode == "yosys":
common._run_yosys(platform.device, sources, platform.verilog_include_paths, build_name) common._run_yosys(platform.device, sources, platform.verilog_include_paths, build_name)
elif synth_mode == "vivado":
_run_vivado(build_name, toolchain_path, source)
else: else:
raise OSError("Error!") raise OSError("Error!")
_run_vivado(build_name, toolchain_path, source)
os.chdir(cwd) os.chdir(cwd)