cpu/rocket: expose 64-bit buses (use automatic down-conversion of SoCCore)

diff --git a/litex/soc/cores/cpu/rocket/core.py b/litex/soc/cores/cpu/rocket/core.py
index 6ec2cc5e1bbfab3463ec1a89d3124849caf35608..2fa220a9811f20b886afbc59fdeb8ce644081c41 100644 (file)
--- a/litex/soc/cores/cpu/rocket/core.py
+++ b/litex/soc/cores/cpu/rocket/core.py
@@ -88,13 +88,10 @@ class RocketRV64(CPU):
         self.mem_axi   =  mem_axi = axi.AXIInterface(data_width=64, address_width=32, id_width=4)
         self.mmio_axi  = mmio_axi = axi.AXIInterface(data_width=64, address_width=32, id_width=4)
 
-        self.mem_wb64  =  mem_wb64 = wishbone.Interface(data_width=64, adr_width=29)
-        self.mmio_wb64 = mmio_wb64 = wishbone.Interface(data_width=64, adr_width=29)
+        self.mem_wb    =  mem_wb = wishbone.Interface(data_width=64, adr_width=29)
+        self.mmio_wb   = mmio_wb = wishbone.Interface(data_width=64, adr_width=29)
 
-        self.mem_wb32  =  mem_wb32 = wishbone.Interface()
-        self.mmio_wb32 = mmio_wb32 = wishbone.Interface()
-
-        self.buses     = [mem_wb32, mmio_wb32]
+        self.buses     = [mem_wb, mmio_wb]
 
         # # #
 
@@ -210,19 +207,14 @@ class RocketRV64(CPU):
         )
 
         # adapt axi interfaces to wishbone
-        mem_a2w  = ResetInserter()(axi.AXI2Wishbone(mem_axi, mem_wb64, base_address=0))
-        mmio_a2w = ResetInserter()(axi.AXI2Wishbone(mmio_axi, mmio_wb64, base_address=0))
+        mem_a2w  = ResetInserter()(axi.AXI2Wishbone(mem_axi, mem_wb, base_address=0))
+        mmio_a2w = ResetInserter()(axi.AXI2Wishbone(mmio_axi, mmio_wb, base_address=0))
         # NOTE: AXI2Wishbone FSMs must be reset with the CPU!
         self.comb += [
             mem_a2w.reset.eq( ResetSignal() | self.reset),
             mmio_a2w.reset.eq(ResetSignal() | self.reset),
         ]
-
-        # down-convert wishbone from 64 to 32 bit data width
-        mem_dc  = wishbone.Converter(mem_wb64, mem_wb32)
-        mmio_dc = wishbone.Converter(mmio_wb64, mmio_wb32)
-
-        self.submodules += mem_a2w, mem_dc, mmio_a2w, mmio_dc
+        self.submodules += mem_a2w, mmio_a2w
 
         # add verilog sources
         self.add_sources(platform, variant)