Skip to content

H
Hdlmake
Commit 26f08930 authored by Javier D. Garcia-Lasheras's avatar Javier D. Garcia-Lasheras
1 Browse files
Options

Fix incl_makefiles being ignored at synthesis and simulation

parent 4043e15b
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
docs/index.rst
View file @ 26f08930
...@@ -1402,7 +1402,7 @@ Top Manifest variables ...@@ -1402,7 +1402,7 @@ Top Manifest variables
+================+==============+=================================================================+===========+ +================+==============+=================================================================+===========+
| action | str | What is the action that should be taken (simulation/synthesis) | "" | | action | str | What is the action that should be taken (simulation/synthesis) | "" |
+----------------+--------------+-----------------------------------------------------------------+-----------+ +----------------+--------------+-----------------------------------------------------------------+-----------+
| incl_makefiles | list, str | List of .mk files appended to toplevel makefile | [] | | incl_makefiles | list | List of .mk files included in the generated makefile | [] |
+----------------+--------------+-----------------------------------------------------------------+-----------+ +----------------+--------------+-----------------------------------------------------------------+-----------+
| language | str | Select the default HDL language if required (verilog, vhdl) | "vhdl" | | language | str | Select the default HDL language if required (verilog, vhdl) | "vhdl" |
+----------------+--------------+-----------------------------------------------------------------+-----------+ +----------------+--------------+-----------------------------------------------------------------+-----------+
......
hdlmake/tools/make_sim.py
View file @ 26f08930
...@@ -34,6 +34,7 @@ class ToolSim(ToolMakefile): ...@@ -34,6 +34,7 @@ class ToolSim(ToolMakefile):
_check_simulation_manifest(config) _check_simulation_manifest(config)
self.makefile_setup(config, fileset, filename=filename) self.makefile_setup(config, fileset, filename=filename)
self.makefile_check_tool('sim_path') self.makefile_check_tool('sim_path')
self.makefile_includes()
self._makefile_sim_top() self._makefile_sim_top()
self._makefile_sim_options() self._makefile_sim_options()
self._makefile_sim_local() self._makefile_sim_local()
......
hdlmake/tools/makefile.py
View file @ 26f08930
...@@ -133,10 +133,11 @@ class ToolMakefile(object): ...@@ -133,10 +133,11 @@ class ToolMakefile(object):
def makefile_includes(self): def makefile_includes(self):
"""Add the included makefiles that need to be previously loaded""" """Add the included makefiles that need to be previously loaded"""
#for file_aux in self.top_module.incl_makefiles: if self.manifest_dict.get("incl_makefiles") is not None:
# if os.path.exists(file_aux): for file_aux in self.manifest_dict["incl_makefiles"]:
# self.write("include %s\n" % file_aux) if os.path.exists(file_aux):
pass self.writeln("include %s" % file_aux)
self.writeln()
def makefile_clean(self): def makefile_clean(self):
"""Print the Makefile target for cleaning intermediate files""" """Print the Makefile target for cleaning intermediate files"""
......
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