From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Wed, 28 Feb 2018 22:45:26 +0000 (+0100)
Subject: build/xilinx/vivado: revert toolchain_path
X-Git-Tag: 24jan2021_ls180~1730
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0332f73a7bf8f8674c823fc3962813f577b8465e;p=litex.git

build/xilinx/vivado: revert toolchain_path
---

diff --git a/litex/build/xilinx/vivado.py b/litex/build/xilinx/vivado.py
index b8220e57..034dcc70 100644
--- a/litex/build/xilinx/vivado.py
+++ b/litex/build/xilinx/vivado.py
@@ -180,6 +180,13 @@ class XilinxVivadoToolchain:
 
     def build(self, platform, fragment, build_dir="build", build_name="top",
             toolchain_path=None, source=True, run=True, **kwargs):
+        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/Vivado"
         os.makedirs(build_dir, exist_ok=True)
         cwd = os.getcwd()
         os.chdir(build_dir)
@@ -198,8 +205,6 @@ class XilinxVivadoToolchain:
         self._build_batch(platform, sources, edifs, build_name)
         tools.write_to_file(build_name + ".xdc", _build_xdc(named_sc, named_pc))
         if run:
-            if toolchain_path is None:
-                toolchain_path = "/opt/Xilinx/Vivado"
             _run_vivado(build_name, toolchain_path, source)
 
         os.chdir(cwd)