From 58414b1819411bde04489330a649e594ef92319d Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Mon, 12 Nov 2018 12:00:30 +0100 Subject: [PATCH] build/xilinx/vivado: merge migen change --- litex/build/xilinx/vivado.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/litex/build/xilinx/vivado.py b/litex/build/xilinx/vivado.py index ab212b1a..1dd4761e 100644 --- a/litex/build/xilinx/vivado.py +++ b/litex/build/xilinx/vivado.py @@ -214,14 +214,9 @@ class XilinxVivadoToolchain: ) def build(self, platform, fragment, build_dir="build", build_name="top", - toolchain_path=None, source=True, run=True): + toolchain_path="/opt/Xilinx/Vivado", source=True, run=True, **kwargs): if toolchain_path is None: - if sys.platform == "win32": - toolchain_path = "C:\\Xilinx\\Vivado" - elif sys.platform == "cygwin": - toolchain_path = "/cygdrive/c/Xilinx/Vivado" - else: - toolchain_path = "/opt/Xilinx/Vivado" + toolchain_path = "/opt/Xilinx/Vivado" os.makedirs(build_dir, exist_ok=True) cwd = os.getcwd() os.chdir(build_dir) -- 2.30.2