vivado: Fix boolean VHDL generics

olofk · Jun 19, 2019 · 57fb0d4 · 57fb0d4
1 parent f4e908d
commit 57fb0d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/edalize/templates/vivado/vivado-project.tcl.j2 b/edalize/templates/vivado/vivado-project.tcl.j2
@@ -19,7 +19,7 @@ set_property generic {
 
 {% if generic -%}
 set_property generic {
-  {%- for k, v in generic.items() %}{{ k }}={{ v|param_value_str }} {% endfor -%}
+  {%- for k, v in generic.items() %}{{ k }}={{ v|generic_value_str(bool_is_str = True) }} {% endfor -%}
   } [get_filesets sources_1]
 {%- endif %}
 

diff --git a/tests/test_vivado.py b/tests/test_vivado.py
@@ -6,7 +6,7 @@ def test_vivado():
     from edalize_common import compare_files, setup_backend, tests_dir
 
     ref_dir      = os.path.join(tests_dir, __name__)
-    paramtypes   = ['vlogdefine', 'vlogparam']
+    paramtypes   = ['generic', 'vlogdefine', 'vlogparam']
     name         = 'test_vivado_0'
     tool         = 'vivado'
     tool_options = {

diff --git a/tests/test_vivado/test_vivado_0.tcl b/tests/test_vivado/test_vivado_0.tcl
@@ -6,7 +6,7 @@ set_property part xc7a35tcsg324-1 [current_project]
 #Default since Vivado 2016.1
 set_param project.enableVHDL2008 1
 set_property generic {vlogparam_bool=1 vlogparam_int=42 vlogparam_str=hello } [get_filesets sources_1]
-
+set_property generic {generic_bool=True generic_int=42 generic_str=hello } [get_filesets sources_1]
 set_property verilog_define {vlogdefine_bool=1 vlogdefine_int=42 vlogdefine_str=hello } [get_filesets sources_1]
 read_verilog -sv sv_file.sv
 source tcl_file.tcl