libero: make sure all paths use the same variable expansion

Signed-off-by: Liam Beguin <[email protected]>
olofk · Dec 29, 2023 · 2f9ca27 · 2f9ca27
1 parent 54445e8
commit 2f9ca27
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/edalize/templates/libero/libero-syn-user.tcl.j2 b/edalize/templates/libero/libero-syn-user.tcl.j2
@@ -3,14 +3,14 @@
 # Libero
 
 {% if vlogparam -%}{%- for k,v in vlogparam.items() %}
-set_option -hdl_param -set {{k}}={{v}}
+set_option -hdl_param -set {{k}}={{ v|generic_value_str(bool_is_str=True) }}
 {% endfor -%}{%- endif %}
 {% if vlogdefine -%}{%- for k,v in vlogdefine.items() %}
-set_option -hdl_define -set {{k}}={{v}}
+set_option -hdl_define -set {{k}}={{ v|generic_value_str(bool_is_str=True) }}
 {% endfor -%}{%- endif %}
 {% if generic -%}
 set_option -hdl_param -set {
-  {%- for k, v in generic.items() %}{{ k }}={{ v|generic_value_str(bool_is_str = True) }} {% endfor -%}
+  {%- for k, v in generic.items() %}{{ k }}={{ v|generic_value_str(bool_is_str=True) }} {% endfor -%}
   }
 {%- endif %}
 

diff --git a/tests/test_libero/libero-test-all-syn-user.tcl b/tests/test_libero/libero-test-all-syn-user.tcl
@@ -2,10 +2,10 @@
 # Synplify Tcl Script
 # Libero
 
-set_option -hdl_param -set vlogparam_bool=True
+set_option -hdl_param -set vlogparam_bool=true
 set_option -hdl_param -set vlogparam_int=42
 set_option -hdl_param -set vlogparam_str=hello
-set_option -hdl_define -set vlogdefine_bool=True
+set_option -hdl_define -set vlogdefine_bool=true
 set_option -hdl_define -set vlogdefine_int=42
 set_option -hdl_define -set vlogdefine_str=hello
 

diff --git a/tests/test_libero/libero-test-syn-user.tcl b/tests/test_libero/libero-test-syn-user.tcl
@@ -2,10 +2,10 @@
 # Synplify Tcl Script
 # Libero
 
-set_option -hdl_param -set vlogparam_bool=True
+set_option -hdl_param -set vlogparam_bool=true
 set_option -hdl_param -set vlogparam_int=42
 set_option -hdl_param -set vlogparam_str=hello
-set_option -hdl_define -set vlogdefine_bool=True
+set_option -hdl_define -set vlogdefine_bool=true
 set_option -hdl_define -set vlogdefine_int=42
 set_option -hdl_define -set vlogdefine_str=hello