Change library files to members

Signed-off-by: Kamil Rakoczy <[email protected]>
olofk · May 12, 2021 · 6898333 · 6898333
1 parent 58f8866
commit 6898333
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/edalize/surelog.py b/edalize/surelog.py
@@ -13,10 +13,12 @@ class Surelog(Edatool):
     def get_doc(cls, api_ver):
         if api_ver == 0:
             return {'description' : "Surelog",
-                    'lists' : [
+                    "members" : [
                         {'name' : 'library_files',
                          'type' : 'String',
                          'desc' : 'List of the library files for Surelog'},
+                        ],
+                    'lists' : [
                         {'name' : 'surelog_options',
                          'type' : 'String',
                          'desc' : 'List of the Surelog parameters'},
@@ -32,10 +34,14 @@ def configure_main(self):
             if f.file_type.startswith('systemVerilogSource'):
                 systemverilog_file_list.append("-sv " + f.name)
 
-        library_files = self.tool_options.get('library_files', [])
+        library_files = self.tool_options.get('library_files', None)
         surelog_options = self.tool_options.get('surelog_options', [])
 
-        pattern = len(library_files) * "-v %s"
+        if library_files:
+            print(library_files)
+            library_files = library_files.split(",")
+
+        pattern = len(library_files) * " -v %s"
         library_command = pattern % tuple(library_files)
 
         pattern = len(self.vlogparam.keys()) * " -P%s=%%s"

diff --git a/edalize/symbiflow.py b/edalize/symbiflow.py
@@ -76,11 +76,13 @@ def get_doc(cls, api_ver):
                         "type" : "String",
                         "desc" : 'Select yosys frontend. Currently "uhdm" and "verilog" frontends are supported.'
                     },
+                    {
+                        "name" : "library_files",
+                        "type" : "String",
+                        "desc" : "list of the library files for surelog"
+                    },
                 ],
                 'lists' : [
-                        {'name' : 'library_files',
-                         'type' : 'String',
-                         'desc' : 'list of the library files for surelog'},
                         {'name' : 'surelog_options',
                          'type' : 'String',
                          'desc' : 'List of options for surelog'},

diff --git a/edalize/vivado.py b/edalize/vivado.py
@@ -58,6 +58,9 @@ def get_doc(cls, api_ver):
                         {'name' : 'hw_target',
                         'type' : 'Description',
                         'desc' : 'Board identifier (e.g. */xilinx_tcf/Digilent/123456789123A'},
+                        {'name' : 'library_files',
+                         'type' : 'String',
+                         'desc' : 'List of the library files for Surelog'},
                     ],
                     'lists' : [
                         {'name' : 'yosys_synth_options',
@@ -66,9 +69,6 @@ def get_doc(cls, api_ver):
                         {'name' : 'yosys_read_options',
                          'type' : 'String',
                          'desc' : 'Additional options for the Yosys\' read command'},
-                        {'name' : 'library_files',
-                         'type' : 'String',
-                         'desc' : 'List of the library files for Surelog'},
                         {'name' : 'surelog_options',
                          'type' : 'String',
                          'desc' : 'Additional options for the Surelog'},

diff --git a/edalize/yosys.py b/edalize/yosys.py
@@ -43,9 +43,6 @@ def get_doc(cls, api_ver):
                         {'name' : 'yosys_synth_options',
                          'type' : 'String',
                          'desc' : 'Additional options for the synth command'},
-                        {'name' : 'library_files',
-                         'type' : 'String',
-                         'desc' : 'List of the library files for Surelog'},
                         {'name' : 'surelog_options',
                          'type' : 'String',
                          'desc' : 'Additional options for the Surelog'},