Skip to content

H
Hdlmake
Commit 605c11b8 authored by Javier D. Garcia-Lasheras's avatar Javier D. Garcia-Lasheras
Browse files
Options

Minor patches to fix the Vivado support on Windows

parent bb5076f4
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
hdlmake/tools/vivado.py
View file @ 605c11b8
...@@ -38,7 +38,7 @@ class ToolVivado(ToolXilinx): ...@@ -38,7 +38,7 @@ class ToolVivado(ToolXilinx):
TOOL_INFO = { TOOL_INFO = {
'name': 'vivado', 'name': 'vivado',
'id': 'vivado', 'id': 'vivado',
'windows_bin': 'vivado.exe -mode tcl -source', 'windows_bin': 'vivado -mode tcl -source',
'linux_bin': 'vivado -mode tcl -source', 'linux_bin': 'vivado -mode tcl -source',
'project_ext': 'xpr' 'project_ext': 'xpr'
} }
...@@ -59,7 +59,7 @@ class ToolVivado(ToolXilinx): ...@@ -59,7 +59,7 @@ class ToolVivado(ToolXilinx):
VHOFile: ToolXilinx._XILINX_SOURCE, VHOFile: ToolXilinx._XILINX_SOURCE,
VEOFile: ToolXilinx._XILINX_SOURCE} VEOFile: ToolXilinx._XILINX_SOURCE}
CLEAN_TARGETS = {'clean': [".Xil", "*.jou", "*.log", "*.pb", CLEAN_TARGETS = {'clean': [".Xil", "*.jou", "*.log", "*.pb", "*.dmp",
"$(PROJECT).cache", "$(PROJECT).data", "work", "$(PROJECT).cache", "$(PROJECT).data", "work",
"$(PROJECT).runs", "$(PROJECT).hw", "$(PROJECT).runs", "$(PROJECT).hw",
"$(PROJECT).ip_user_files", "$(PROJECT_FILE)"]} "$(PROJECT).ip_user_files", "$(PROJECT_FILE)"]}
......
hdlmake/tools/vivado_sim.py
View file @ 605c11b8
...@@ -35,7 +35,7 @@ class ToolVivadoSim(ToolSim): ...@@ -35,7 +35,7 @@ class ToolVivadoSim(ToolSim):
TOOL_INFO = { TOOL_INFO = {
'name': 'vivado-sim', 'name': 'vivado-sim',
'id': 'vivado-sim', 'id': 'vivado-sim',
'windows_bin': 'vivado.exe -mode tcl -source', 'windows_bin': 'vivado -mode tcl -source',
'linux_bin': 'vivado -mode tcl -source', 'linux_bin': 'vivado -mode tcl -source',
} }
......
hdlmake/tools/xilinx.py
View file @ 605c11b8
...@@ -100,9 +100,9 @@ $(TCL_CLOSE)''' ...@@ -100,9 +100,9 @@ $(TCL_CLOSE)'''
"""Create a Xilinx synthesis project by TCL""" """Create a Xilinx synthesis project by TCL"""
prop_val = 'set_property "{0}" "{1}" [{2}]' prop_val = 'set_property "{0}" "{1}" [{2}]'
prop_opt = 'set_property -name {{{0}}} -value {{{1}}} -objects [{2}]' prop_opt = 'set_property -name {{{0}}} -value {{{1}}} -objects [{2}]'
project_new = [] project_new = ['# project properties']
synthesize_new = [] synthesize_new = ['# synthesize properties']
par_new = [] par_new = ['# par properties']
properties = self._get_properties() properties = self._get_properties()
for prop in properties: for prop in properties:
if len(prop) > 1: if len(prop) > 1:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment