Skip to content

H
Hdlmake
Commit bcc5eff6 authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

Adjust liberosoc.py and the corresponding baseline

parent f37af708
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 23 deletions
hdlmake/tools/liberosoc.py
View file @ bcc5eff6
...@@ -151,7 +151,6 @@ class ToolLiberoSoC(MakefileSyn): ...@@ -151,7 +151,6 @@ class ToolLiberoSoC(MakefileSyn):
else: else:
logging.info(self.TOOL_INFO['name'] + "TODO: Somebody needs to add device support for this family, PolarFireSoC and IGLOO2 are supported. Can you do it?") logging.info(self.TOOL_INFO['name'] + "TODO: Somebody needs to add device support for this family, PolarFireSoC and IGLOO2 are supported. Can you do it?")
def _makefile_syn_files_map_files_to_lib(self): def _makefile_syn_files_map_files_to_lib(self):
"""map specific files to specific libraries when it has to be a separate command""" """map specific files to specific libraries when it has to be a separate command"""
fileset_dict = {} fileset_dict = {}
...@@ -173,14 +172,9 @@ class ToolLiberoSoC(MakefileSyn): ...@@ -173,14 +172,9 @@ class ToolLiberoSoC(MakefileSyn):
command = command.format(srcfile=shell.tclpath(srcfile.rel_path()), command = command.format(srcfile=shell.tclpath(srcfile.rel_path()),
library=library) library=library)
command = '\t\techo "{}" >> $@'.format(command) command = "\t\techo '{}' >> $@".format(command)
if shell.check_windows_commands():
command = command.replace('"', '')
self.writeln(command) self.writeln(command)
def _makefile_syn_tcl(self): def _makefile_syn_tcl(self):
"""Create a Libero synthesis project by TCL""" """Create a Libero synthesis project by TCL"""
syn_project = self.manifest_dict["syn_project"] syn_project = self.manifest_dict["syn_project"]
......
testsuite/114_libero_libraries/Makefile.ref
View file @ bcc5eff6
...@@ -32,22 +32,22 @@ files.tcl: ...@@ -32,22 +32,22 @@ files.tcl:
@echo add_library -library lib_a >> $@ @echo add_library -library lib_a >> $@
@echo add_library -library lib_b >> $@ @echo add_library -library lib_b >> $@
@echo add_library -library lib_c >> $@ @echo add_library -library lib_c >> $@
echo "create_links -hdl_source rtl/lib_a/axi_regs_a.vhd" >> $@ echo 'create_links -hdl_source rtl/lib_a/axi_regs_a.vhd' >> $@
echo "create_links -hdl_source rtl/lib_a/register_access_fns_pkg.vhd" >> $@ echo 'create_links -hdl_source rtl/lib_a/register_access_fns_pkg.vhd' >> $@
echo "create_links -hdl_source rtl/lib_a/register_types_pkg.vhd" >> $@ echo 'create_links -hdl_source rtl/lib_a/register_types_pkg.vhd' >> $@
echo "create_links -hdl_source rtl/lib_b/axi_regs_b.vhd" >> $@ echo 'create_links -hdl_source rtl/lib_b/axi_regs_b.vhd' >> $@
echo "create_links -hdl_source rtl/lib_b/register_access_fns_pkg.vhd" >> $@ echo 'create_links -hdl_source rtl/lib_b/register_access_fns_pkg.vhd' >> $@
echo "create_links -hdl_source rtl/lib_b/register_types_pkg.vhd" >> $@ echo 'create_links -hdl_source rtl/lib_b/register_types_pkg.vhd' >> $@
echo "create_links -hdl_source rtl/lib_c/merged_top.vhd" >> $@ echo 'create_links -hdl_source rtl/lib_c/merged_top.vhd' >> $@
echo "create_links -hdl_source rtl/lib_c/repinned_top.vhd" >> $@ echo 'create_links -hdl_source rtl/lib_c/repinned_top.vhd' >> $@
echo "add_file_to_library -library lib_a -file rtl/lib_a/axi_regs_a.vhd" >> $@ echo 'add_file_to_library -library lib_a -file rtl/lib_a/axi_regs_a.vhd' >> $@
echo "add_file_to_library -library lib_a -file rtl/lib_a/register_access_fns_pkg.vhd" >> $@ echo 'add_file_to_library -library lib_a -file rtl/lib_a/register_access_fns_pkg.vhd' >> $@
echo "add_file_to_library -library lib_a -file rtl/lib_a/register_types_pkg.vhd" >> $@ echo 'add_file_to_library -library lib_a -file rtl/lib_a/register_types_pkg.vhd' >> $@
echo "add_file_to_library -library lib_b -file rtl/lib_b/axi_regs_b.vhd" >> $@ echo 'add_file_to_library -library lib_b -file rtl/lib_b/axi_regs_b.vhd' >> $@
echo "add_file_to_library -library lib_b -file rtl/lib_b/register_access_fns_pkg.vhd" >> $@ echo 'add_file_to_library -library lib_b -file rtl/lib_b/register_access_fns_pkg.vhd' >> $@
echo "add_file_to_library -library lib_b -file rtl/lib_b/register_types_pkg.vhd" >> $@ echo 'add_file_to_library -library lib_b -file rtl/lib_b/register_types_pkg.vhd' >> $@
echo "add_file_to_library -library lib_c -file rtl/lib_c/merged_top.vhd" >> $@ echo 'add_file_to_library -library lib_c -file rtl/lib_c/merged_top.vhd' >> $@
echo "add_file_to_library -library lib_c -file rtl/lib_c/repinned_top.vhd" >> $@ echo 'add_file_to_library -library lib_c -file rtl/lib_c/repinned_top.vhd' >> $@
SYN_PRE_PROJECT_CMD := SYN_PRE_PROJECT_CMD :=
SYN_POST_PROJECT_CMD := SYN_POST_PROJECT_CMD :=
......
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