Fix Qsys filename in quartus-std-makefile template

Signed-off-by: Walter Goossens <waltergoossens@creative-embedded.com>
olofk · Apr 9, 2019 · 4df315f · 4df315f
1 parent fa590ab
commit 4df315f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/edalize/templates/quartus/quartus-std-makefile.j2 b/edalize/templates/quartus/quartus-std-makefile.j2
@@ -9,7 +9,7 @@ project: $(NAME).tcl
 
 qsys: project
 {% for qsys_file in src_files if qsys_file|qsys_file_filter %}
-	ip-generate --project-directory={{qsys_file.srcdir}} --output-directory={{qsys_file.dstdir}} --report-file=bsf:{{qsys_file.dstdir}}/{{qsys_file.simplename}}.bsf --system-info=DEVICE_FAMILY="{{tool_options.family}}" --system-info=DEVICE={{tool_options.device}} --component-file={{qsys_file.srcdir}}/{{qsys_file.name}}
+	ip-generate --project-directory={{qsys_file.srcdir}} --output-directory={{qsys_file.dstdir}} --report-file=bsf:{{qsys_file.dstdir}}/{{qsys_file.simplename}}.bsf --system-info=DEVICE_FAMILY="{{tool_options.family}}" --system-info=DEVICE={{tool_options.device}} --component-file={{qsys_file.srcdir}}/{{qsys_file.simplename}}.qsys
 	ip-generate --project-directory={{qsys_file.srcdir}} --output-directory={{qsys_file.dstdir}}/synthesis --file-set=QUARTUS_SYNTH --report-file=sopcinfo:{{qsys_file.dstdir}}/{{qsys_file.simplename}}.sopcinfo --report-file=html:{{qsys_file.dstdir}}/{{qsys_file.simplename}}.html --report-file=qip:{{qsys_file.dstdir}}/{{qsys_file.simplename}}.qip --report-file=cmp:{{qsys_file.dstdir}}/{{qsys_file.simplename}}.cmp --report-file=svd --system-info=DEVICE_FAMILY="{{tool_options.family}}" --system-info=DEVICE={{tool_options.device}} --component-file={{qsys_file.srcdir}}/{{qsys_file.simplename}}.qsys --language=VERILOG
 {% endfor %}
 

diff --git a/tests/test_quartus/Standard/Makefile b/tests/test_quartus/Standard/Makefile
@@ -8,7 +8,7 @@ project: $(NAME).tcl
 	quartus_sh $(OPTIONS) -t $(NAME).tcl
 
 qsys: project
-	ip-generate --project-directory= --output-directory=qsys/qsys_file --report-file=bsf:qsys/qsys_file/qsys_file.bsf --system-info=DEVICE_FAMILY="Cyclone V" --system-info=DEVICE=5CSXFC6D6F31C8ES --component-file=/qsys_file
+	ip-generate --project-directory= --output-directory=qsys/qsys_file --report-file=bsf:qsys/qsys_file/qsys_file.bsf --system-info=DEVICE_FAMILY="Cyclone V" --system-info=DEVICE=5CSXFC6D6F31C8ES --component-file=/qsys_file.qsys
 	ip-generate --project-directory= --output-directory=qsys/qsys_file/synthesis --file-set=QUARTUS_SYNTH --report-file=sopcinfo:qsys/qsys_file/qsys_file.sopcinfo --report-file=html:qsys/qsys_file/qsys_file.html --report-file=qip:qsys/qsys_file/qsys_file.qip --report-file=cmp:qsys/qsys_file/qsys_file.cmp --report-file=svd --system-info=DEVICE_FAMILY="Cyclone V" --system-info=DEVICE=5CSXFC6D6F31C8ES --component-file=/qsys_file.qsys --language=VERILOG
 
 map: qsys