Skip to content

H
Hdlmake
Commit 4a3c2dab authored by Pawel Szostek's avatar Pawel Szostek
Browse files
Options

minor fixes

parent 9e906228
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
hdlmake/action/ise_project.py
View file @ 4a3c2dab
......@@ -33,10 +33,11 @@ from util import path
class GenerateISEProject(Action):
def _check_manifest(self):
self._check_manifest_variable_is_set("top_module")
# self._check_manifest_variable_is_set("top_module")
self._check_manifest_variable_is_set("syn_device")
self._check_manifest_variable_is_set("syn_grade")
self._check_manifest_variable_is_set("syn_package")
self._check_manifest_variable_is_set("syn_top")
def _check_env(self):
env = self.env
......@@ -143,7 +144,7 @@ end sdb_meta_pkg;""")
date_std_logic_vector = []
import re
for digit in date_string:
date_std_logic_vector.append("{0:b}".format(digit))
date_std_logic_vector.append("{0:b}".format(int(digit)))
syn_tool_version = global_mod.env["ise_version"]
syn_tool_version = re.sub("\D", "", syn_tool_version)
......
hdlmake/env.py
View file @ 4a3c2dab
......@@ -118,7 +118,7 @@ class Env(dict):
# determine ISE version
if self.top_module:
if self.top_module.syn_ise_version is not None:
ise_version = tuple(self.top_module.syn_ise_version)
ise_version = self.top_module.syn_ise_version
print("ise_version set in the manifest: %s" % ise_version)
self["ise_version"] = ise_version
elif self["ise_version"] is not None:
......
hdlmake/tools/ise.py
View file @ 4a3c2dab
......@@ -160,8 +160,8 @@ class ISEProject(object):
self.add_property("Device Family", FAMILY_NAMES[tm.syn_device[0:4].upper()])
self.add_property("Speed Grade", tm.syn_grade)
self.add_property("Package", tm.syn_package)
self.add_property("Implementation Top", "Architecture|"+tm.top_module)
self.add_property("Implementation Top Instance Path", "/"+tm.top_module)
self.add_property("Implementation Top", "Architecture|"+tm.syn_top)
self.add_property("Implementation Top Instance Path", "/"+tm.syn_top)
def _parse_props(self):
for xmlp in self.xml_project.getElementsByTagName("properties")[0].getElementsByTagName("property"):
......
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