From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Mon, 29 Oct 2018 07:26:13 +0000 (+0100)
Subject: build/xilinx/vivado: fix merge issue
X-Git-Tag: 24jan2021_ls180~1550
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a73d9d96b173b01849c3ca6ade66fb9813645800;p=litex.git

build/xilinx/vivado: fix merge issue
---

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