Separate filters for generics and parameters and change boolean handl…

…ing for older Quartus
olofk · Apr 10, 2019 · 5964167 · 5964167
1 parent 4f97345
commit 5964167
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/edalize/edatool.py b/edalize/edatool.py
@@ -76,7 +76,8 @@ def __init__(self, edam=None, work_root=None, eda_api=None):
             trim_blocks = True,
             lstrip_blocks = True,
         )
-        self.jinja_env.filters['param_value_str'] = jinja_filter_param_value_str
+        self.jinja_env.filters['param_value_str']   = jinja_filter_param_value_str
+        self.jinja_env.filters['generic_value_str'] = jinja_filter_param_value_str
 
     @classmethod
     def get_doc(cls, api_ver):

diff --git a/edalize/quartus.py b/edalize/quartus.py
@@ -81,6 +81,12 @@ def __init__(self, edam=None, work_root=None, eda_api=None):
 
         self.isPro = (version['edition'] == "Pro")
 
+        # Quartus Pro 17 and later use 1/0 for boolean generics. Other editions
+        # and versions use "true"/"false" strings
+        if (version['edition'] != "Pro") or (int(version['major']) < 17):
+            self.jinja_env.filters['generic_value_str'] = \
+                partial(self.jinja_env.filters['generic_value_str'], bool_is_str=True)
+
     """ Configuration is the first phase of the build
 
     This writes the project TCL files and Makefile. It first collects all

diff --git a/edalize/templates/quartus/quartus-project.tcl.j2 b/edalize/templates/quartus/quartus-project.tcl.j2
@@ -14,7 +14,7 @@ set_parameter -name {{k}} {{v|param_value_str}}
 {% endif %}
 {% if generic %}
 {% for k, v in generic.items() %}
-set_parameter -name {{k}} {{v|param_value_str}}
+set_parameter -name {{k}} {{v|generic_value_str}}
 {% endfor %}
 {% endif %}
 {% if vlogdefine %}