From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Mon, 30 Dec 2019 09:07:08 +0000 (+0100)
Subject: build/xilinx/programmer: fix vivado_cmd when settings are sourced manually.
X-Git-Tag: 24jan2021_ls180~790
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=85ade2b3b35fb8093f22b573ba342affe3c055fb;p=litex.git

build/xilinx/programmer: fix vivado_cmd when settings are sourced manually.
---

diff --git a/litex/build/xilinx/programmer.py b/litex/build/xilinx/programmer.py
index 64f71860..0ad0abac 100644
--- a/litex/build/xilinx/programmer.py
+++ b/litex/build/xilinx/programmer.py
@@ -139,8 +139,8 @@ def _run_vivado(path, ver, cmds):
                 break
             else:
                 raise OSError("Unable to locate Vivado directory or settings.")
-            vivado_cmd += "source " + settings
-        vivado_cmd += " && vivado -mode tcl"
+            vivado_cmd += "source " + settings + " && "
+        vivado_cmd += "vivado -mode tcl"
     with subprocess.Popen(vivado_cmd, stdin=subprocess.PIPE, shell=True) as process:
         process.stdin.write(cmds.encode("ASCII"))
         process.communicate()