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

soc/cores/cpu/urv: Move ROM init to builder and allow switching between classical ROM or ROM integrated in CPU.

This commit is contained in:
Florent Kermarrec 2024-10-17 17:44:40 +02:00
parent 9449d25911
commit aab8912f5a
2 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
litex/soc/cores/cpu/urv/core.py
View File

@ -86,8 +86,8 @@ class uRV(CPU):
# ------------- # -------------
self.cpu_params = dict( self.cpu_params = dict(
# Parameters. # Parameters.
p_g_timer_frequency = 1000, p_g_timer_frequency = 1000, # FIXME.
p_g_clock_frequency = 100000000, p_g_clock_frequency = 100000000, # FIXME.
p_g_with_hw_div = 1, p_g_with_hw_div = 1,
p_g_with_hw_mulh = 1, p_g_with_hw_mulh = 1,
p_g_with_hw_mul = 1, p_g_with_hw_mul = 1,
@ -119,47 +119,39 @@ class uRV(CPU):
# uRV Instruction Bus. # uRV Instruction Bus.
# -------------------- # --------------------
if True:
from litex.soc.integration.common import get_mem_data from litex.soc.integration.common import get_mem_data
self.rom = Memory(32, depth=131072//4)
try: self.rom_port = self.rom.get_port()
# FIXME.
rom_init = get_mem_data("build/sim/software/bios/bios.bin",
data_width = 32,
endianness = "little"
)
except:
rom_init = []
rom = Memory(32, depth=131072//4, init=rom_init)
rom_port = rom.get_port()
self.specials += rom, rom_port
self.sync += im_valid.eq(1), self.sync += im_valid.eq(1),
self.comb += [ self.comb += [
rom_port.adr.eq(im_addr[2:]), self.rom_port.adr.eq(im_addr[2:]),
im_data.eq(rom_port.dat_r), im_data.eq(self.rom_port.dat_r),
] ]
else:
# im_addr_d = Signal(32, reset=0xffffffff) # FIXME: Try to implement im_bus -> Wishbone correctly (if possible).
# self.sync += im_addr_d.eq(im_addr) im_addr_d = Signal(32, reset=0xffffffff)
# self.i_fsm = i_fsm = FSM(reset_state="IDLE") self.sync += im_addr_d.eq(im_addr)
# i_fsm.act("IDLE", self.i_fsm = i_fsm = FSM(reset_state="IDLE")
# If(im_addr != im_addr_d, i_fsm.act("IDLE",
# NextValue(im_valid, 0), If(im_addr != im_addr_d,
# NextState("READ") NextValue(im_valid, 0),
# ) NextState("READ")
# ) )
# i_fsm.act("READ", )
# ibus.stb.eq(1), i_fsm.act("READ",
# ibus.cyc.eq(1), ibus.stb.eq(1),
# ibus.we.eq(0), ibus.cyc.eq(1),
# ibus.adr.eq(im_addr), ibus.we.eq(0),
# ibus.sel.eq(0b1111), ibus.adr.eq(im_addr),
# If(ibus.ack, ibus.sel.eq(0b1111),
# NextValue(im_valid, 1), If(ibus.ack,
# NextValue(im_data, ibus.dat_r), NextValue(im_valid, 1),
# NextState("IDLE") NextValue(im_data, ibus.dat_r),
# ) NextState("IDLE")
# ) )
)
# uRV Data Bus. # uRV Data Bus.
# ------------- # -------------

5
litex/soc/integration/builder.py
View File

@ -339,6 +339,11 @@ class Builder:
# Initialize SoC with with BIOS data. # Initialize SoC with with BIOS data.
self.soc.init_rom(name="rom", contents=bios_data) self.soc.init_rom(name="rom", contents=bios_data)
# FIXME: Remove uRV ROM Init Workaround.
from litex.soc.cores.cpu.urv import uRV
if isinstance(self.soc.cpu, uRV):
self.soc.cpu.rom.init = bios_data
def build(self, **kwargs): def build(self, **kwargs):
# Pass Output Directory to Platform. # Pass Output Directory to Platform.
self.soc.platform.output_dir = self.output_dir self.soc.platform.output_dir = self.output_dir