Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #262 from jersey99/master 

vivado just needs to be in the path for the programmer as well
This commit is contained in:
enjoy-digital 2019-09-20 06:25:57 +02:00 committed by GitHub
parent 430fee4dbd 9ea11cf5ab
commit 4f659ba422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
litex/build/xilinx/programmer.py
View File

@ -7,6 +7,7 @@
import os import os
import sys import sys
import subprocess import subprocess
from distutils.spawn import find_executable
from litex.build.generic_programmer import GenericProgrammer from litex.build.generic_programmer import GenericProgrammer
from litex.build.xilinx import common from litex.build.xilinx import common
@ -116,9 +117,11 @@ quit
def _run_vivado(path, ver, cmds): def _run_vivado(path, ver, cmds):
vivado_cmd = "echo 0"
if sys.platform == "win32" or sys.platform == "cygwin": if sys.platform == "win32" or sys.platform == "cygwin":
vivado_cmd = "vivado -mode tcl" vivado_cmd = "vivado -mode tcl"
else: else:
if not find_executable("vivado"):
# For backwards compatibility with ISE paths, also # For backwards compatibility with ISE paths, also
# look for a version in a subdirectory named "Vivado" # look for a version in a subdirectory named "Vivado"
# under the current directory. # under the current directory.
@ -131,7 +134,8 @@ def _run_vivado(path, ver, cmds):
break break
else: else:
raise OSError("Unable to locate Vivado directory or settings.") raise OSError("Unable to locate Vivado directory or settings.")
vivado_cmd = "bash -c \"source " + settings + "&& vivado -mode tcl\"" vivado_cmd += "source " + settings
vivado_cmd += " && vivado -mode tcl"
with subprocess.Popen(vivado_cmd, stdin=subprocess.PIPE, shell=True) as process: with subprocess.Popen(vivado_cmd, stdin=subprocess.PIPE, shell=True) as process:
process.stdin.write(cmds.encode("ASCII")) process.stdin.write(cmds.encode("ASCII"))
process.communicate() process.communicate()