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

cores/vexriscv_smp: Fix vexriscv_smp doesn't build without a memory bus 

The current code only works with a memory bus because otherwise
"generate_cluster_name" doesn't get called.
Cluster_name is only needed in the finalize phase.
Therefore, the name will now be generated just before its usage.

Verifiable with: 
litex_sim --cpu-type vexriscv_smp (should be broken before this commit)
This commit is contained in:
Christian Klarhorst 2021-08-11 14:12:15 +02:00
parent ab9f214a5e
commit ebe22ca2b6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
litex/soc/cores/cpu/vexriscv_smp/core.py Normal file → Executable file
View File

@ -419,8 +419,6 @@ class VexRiscvSMP(CPU):
def add_memory_buses(self, address_width, data_width): def add_memory_buses(self, address_width, data_width):
VexRiscvSMP.litedram_width = data_width VexRiscvSMP.litedram_width = data_width
VexRiscvSMP.generate_cluster_name()
from litedram.common import LiteDRAMNativePort from litedram.common import LiteDRAMNativePort
if(not VexRiscvSMP.wishbone_memory): if(not VexRiscvSMP.wishbone_memory):
ibus = LiteDRAMNativePort(mode="both", address_width=32, data_width=VexRiscvSMP.litedram_width) ibus = LiteDRAMNativePort(mode="both", address_width=32, data_width=VexRiscvSMP.litedram_width)
@ -457,6 +455,7 @@ class VexRiscvSMP(CPU):
def do_finalize(self): def do_finalize(self):
assert hasattr(self, "reset_address") assert hasattr(self, "reset_address")
VexRiscvSMP.generate_cluster_name()
self.specials += Instance(self.cluster_name, **self.cpu_params) self.specials += Instance(self.cluster_name, **self.cpu_params)
# Add Verilog sources # Add Verilog sources