Skip to content

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

Fix some bugs in the not yet tested synthesis tools

parent 54ed686c
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
hdlmake/tools/diamond.py
View file @ 4fe91d83
...@@ -74,15 +74,15 @@ class ToolDiamond(ToolSyn): ...@@ -74,15 +74,15 @@ class ToolDiamond(ToolSyn):
"""Get version from the Lattice Diamond program""" """Get version from the Lattice Diamond program"""
return 'unknown' return 'unknown'
def makefile_syn_tcl(self, top_module, tcl_controls): def makefile_syn_tcl(self, top_module):
"""Create a Diamond synthesis project by TCL""" """Create a Diamond synthesis project by TCL"""
syn_device = top_module.manifest_dict["syn_device"] syn_device = top_module.manifest_dict["syn_device"]
syn_grade = top_module.manifest_dict["syn_grade"] syn_grade = top_module.manifest_dict["syn_grade"]
syn_package = top_module.manifest_dict["syn_package"] syn_package = top_module.manifest_dict["syn_package"]
create_tmp = tcl_controls["create"] create_tmp = self._tcl_controls["create"]
target = syn_device + syn_grade + syn_package target = syn_device + syn_grade + syn_package
tcl_controls["create"] = create_tmp.format(target.upper()) self._tcl_controls["create"] = create_tmp.format(target.upper())
super(ToolDiamond, self).makefile_syn_tcl(top_module, tcl_controls) super(ToolDiamond, self).makefile_syn_tcl(top_module)
def makefile_syn_files(self, fileset): def makefile_syn_files(self, fileset):
"""Write the files TCL section of the Makefile""" """Write the files TCL section of the Makefile"""
......
hdlmake/tools/libero.py
View file @ 4fe91d83
...@@ -76,18 +76,18 @@ class ToolLibero(ToolSyn): ...@@ -76,18 +76,18 @@ class ToolLibero(ToolSyn):
"""Get version for Microsemi Libero IDE synthesis""" """Get version for Microsemi Libero IDE synthesis"""
return 'unknown' return 'unknown'
def makefile_syn_tcl(self, top_module, tcl_controls): def makefile_syn_tcl(self, top_module):
"""Create a Libero synthesis project by TCL""" """Create a Libero synthesis project by TCL"""
syn_project = top_module.manifest_dict["syn_project"] syn_project = top_module.manifest_dict["syn_project"]
syn_device = top_module.manifest_dict["syn_device"] syn_device = top_module.manifest_dict["syn_device"]
syn_grade = top_module.manifest_dict["syn_grade"] syn_grade = top_module.manifest_dict["syn_grade"]
syn_package = top_module.manifest_dict["syn_package"] syn_package = top_module.manifest_dict["syn_package"]
create_tmp = tcl_controls["create"] create_tmp = self._tcl_controls["create"]
tcl_controls["create"] = create_tmp.format(syn_project, self._tcl_controls["create"] = create_tmp.format(syn_project,
syn_device.upper(), syn_device.upper(),
syn_package.upper(), syn_package.upper(),
syn_grade) syn_grade)
super(ToolLibero, self).makefile_syn_tcl(top_module, tcl_controls) super(ToolLibero, self).makefile_syn_tcl(top_module)
def makefile_syn_files(self, fileset): def makefile_syn_files(self, fileset):
"""Write the files TCL section of the Makefile""" """Write the files TCL section of the Makefile"""
......
hdlmake/tools/quartus.py
View file @ 4fe91d83
...@@ -95,7 +95,7 @@ class ToolQuartus(ToolSyn): ...@@ -95,7 +95,7 @@ class ToolQuartus(ToolSyn):
"""Get Altera Quartus version from the binary program""" """Get Altera Quartus version from the binary program"""
return 'unknown' return 'unknown'
def makefile_syn_tcl(self, top_module, tcl_controls): def makefile_syn_tcl(self, top_module):
"""Add initial properties to the Altera Quartus project""" """Add initial properties to the Altera Quartus project"""
import re import re
def _emit_property(command, what=None, name=None, name_type=None, def _emit_property(command, what=None, name=None, name_type=None,
...@@ -145,7 +145,7 @@ class ToolQuartus(ToolSyn): ...@@ -145,7 +145,7 @@ class ToolQuartus(ToolSyn):
sys.exit("\nExiting") sys.exit("\nExiting")
devstring = (syn_device + syn_package + syn_grade).upper() devstring = (syn_device + syn_package + syn_grade).upper()
command_list = [] command_list = []
command_list.append(tcl_controls["create"]) command_list.append(self._tcl_controls["create"])
command_list.append(_emit_property(self.SET_GLOBAL_ASSIGNMENT, command_list.append(_emit_property(self.SET_GLOBAL_ASSIGNMENT,
name_type='FAMILY', name_type='FAMILY',
name='"' + syn_family + '"')) name='"' + syn_family + '"'))
...@@ -191,8 +191,8 @@ class ToolQuartus(ToolSyn): ...@@ -191,8 +191,8 @@ class ToolQuartus(ToolSyn):
command_list.append(_emit_property(self.SET_GLOBAL_ASSIGNMENT, command_list.append(_emit_property(self.SET_GLOBAL_ASSIGNMENT,
name_type='POST_FLOW_SCRIPT_FILE', name_type='POST_FLOW_SCRIPT_FILE',
name=postflow)) name=postflow))
tcl_controls["create"] = '\n'.join(command_list) self._tcl_controls["create"] = '\n'.join(command_list)
super(ToolQuartus, self).makefile_syn_tcl(top_module, tcl_controls) super(ToolQuartus, self).makefile_syn_tcl(top_module)
def makefile_syn_files(self, fileset): def makefile_syn_files(self, fileset):
......
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