Skip to content

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

Fix ISim not getting the right 'ini' file

parent 32141242
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
hdlmake/tools/isim.py
View file @ 66d9f8e8
...@@ -70,10 +70,11 @@ class ToolISim(ToolSim): ...@@ -70,10 +70,11 @@ class ToolISim(ToolSim):
"""Print the top section of the Makefile for Xilinx ISim""" """Print the top section of the Makefile for Xilinx ISim"""
top_module = self.top_module top_module = self.top_module
def __get_xilinxsim_ini_dir(env): def __get_xilinxsim_ini_dir():
"""Get Xilinx ISim ini simulation file""" """Get Xilinx ISim ini simulation file"""
if env["isim_path"]: if top_module.manifest_dict["sim_path"]:
xilinx_dir = str(os.path.join(env["isim_path"], "..", "..")) xilinx_dir = str(os.path.join(
top_module.manifest_dict["sim_path"], "..", ".."))
else: else:
logging.error("Cannot calculate xilinx tools base directory") logging.error("Cannot calculate xilinx tools base directory")
quit() quit()
...@@ -97,7 +98,7 @@ PWD := $(shell pwd) ...@@ -97,7 +98,7 @@ PWD := $(shell pwd)
TOP_MODULE := """ + top_module.manifest_dict["sim_top"] + """ TOP_MODULE := """ + top_module.manifest_dict["sim_top"] + """
FUSE_OUTPUT ?= isim_proj FUSE_OUTPUT ?= isim_proj
XILINX_INI_PATH := """ + __get_xilinxsim_ini_dir(top_module.pool.env) + XILINX_INI_PATH := """ + __get_xilinxsim_ini_dir() +
""" """
""") """)
......
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