Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix call to generation of minerva output file 

With nmigen/nmigen#a7b8ced, cli.py no longer defaults to generating
verilog code, so -t/--type has to be specified explicitly.

$ pytest test/test_targets.py -k test_variants_minerva
[...]
cli.py: error: specify file type explicitly with -t
This commit is contained in:
Xiretza 2020-08-22 14:42:14 +02:00
parent 35929c0f8a
commit e3bb3a9488
No known key found for this signature in database
GPG Key ID: 17B78226F7139993
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
litex/soc/cores/cpu/minerva/core.py
View File

@ -100,8 +100,10 @@ class Minerva(CPU):
cli_params.append("--with-dcache") cli_params.append("--with-dcache")
if with_muldiv: if with_muldiv:
cli_params.append("--with-muldiv") cli_params.append("--with-muldiv")
cli_params.append("generate")
cli_params.append("--type=v")
sdir = get_data_mod("cpu", "minerva").data_location sdir = get_data_mod("cpu", "minerva").data_location
if subprocess.call(["python3", os.path.join(sdir, "cli.py"), *cli_params, "generate"], if subprocess.call(["python3", os.path.join(sdir, "cli.py"), *cli_params],
stdout=open(verilog_filename, "w")): stdout=open(verilog_filename, "w")):
raise OSError("Unable to elaborate Minerva CPU, please check your nMigen/Yosys install") raise OSError("Unable to elaborate Minerva CPU, please check your nMigen/Yosys install")