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

serv: fix ibus/dbus byte/word addressing inconsistency, add missing ibus.sel (thanks @GregDavill).

This commit is contained in:
Florent Kermarrec 2020-04-26 16:26:15 +02:00
parent 22c3923644
commit 2efd939d06
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
litex/soc/cores/cpu/serv/core.py
View File

@ -36,7 +36,7 @@ class SERV(CPU):
self.reset = Signal() self.reset = Signal()
self.ibus = ibus = wishbone.Interface() self.ibus = ibus = wishbone.Interface()
self.dbus = dbus = wishbone.Interface() self.dbus = dbus = wishbone.Interface()
self.buses = [self.ibus, dbus] self.buses = [ibus, dbus]
self.interrupt = Signal(32) self.interrupt = Signal(32)
# # # # # #
@ -50,14 +50,13 @@ class SERV(CPU):
i_i_timer_irq = 0, i_i_timer_irq = 0,
# ibus # ibus
o_o_ibus_adr = ibus.adr, o_o_ibus_adr = Cat(Signal(2), ibus.adr),
o_o_ibus_cyc = ibus.cyc, o_o_ibus_cyc = ibus.cyc,
i_i_ibus_rdt = ibus.dat_r, i_i_ibus_rdt = ibus.dat_r,
i_i_ibus_ack = ibus.ack, i_i_ibus_ack = ibus.ack,
# dbus # dbus
o_o_dbus_adr = dbus.adr, o_o_dbus_adr = Cat(Signal(2), dbus.adr),
o_o_dbus_dat = dbus.dat_w, o_o_dbus_dat = dbus.dat_w,
o_o_dbus_sel = dbus.sel, o_o_dbus_sel = dbus.sel,
o_o_dbus_we = dbus.we, o_o_dbus_we = dbus.we,
@ -67,6 +66,7 @@ class SERV(CPU):
) )
self.comb += [ self.comb += [
ibus.stb.eq(ibus.cyc), ibus.stb.eq(ibus.cyc),
ibus.sel.eq(0xf),
dbus.stb.eq(dbus.cyc), dbus.stb.eq(dbus.cyc),
] ]