urk. wishbone slave devices declared incorrectly (I/O inverted)

[soc.git] / src / soc / litex / florent / libresoc / core.py

diff --git a/src/soc/litex/florent/libresoc/core.py b/src/soc/litex/florent/libresoc/core.py
index 49e4bd3a022a0b90ad11980896e070700729332e..a9571eb5d249ed624ce69ff7fde14c16cbed290a 100644 (file)
--- a/src/soc/litex/florent/libresoc/core.py
+++ b/src/soc/litex/florent/libresoc/core.py
@@ -2,17 +2,33 @@ import os
 
 from migen import ClockSignal, ResetSignal, Signal, Instance, Cat
 
-from litex.soc.interconnect import wishbone
+from litex.soc.interconnect import wishbone as wb
 from litex.soc.cores.cpu import CPU
 
-CPU_VARIANTS = ["standard"]
+CPU_VARIANTS = ["standard", "standard32", "ls180"]
+
+
+def make_wb_bus(prefix, obj):
+    res = {}
+    for o in ['stb', 'cyc', 'cti', 'bte', 'we', 'adr', 'dat_w', 'sel']:
+        res['o_%s_%s' % (prefix, o)] = getattr(obj, o)
+    for i in ['ack', 'err', 'dat_r']:
+        res['i_%s_%s' % (prefix, i)] = getattr(obj, i)
+    return res
+
+def make_wb_slave(prefix, obj):
+    res = {}
+    for i in ['stb', 'cyc', 'cti', 'bte', 'we', 'adr', 'dat_w', 'sel']:
+        res['i_%s_%s' % (prefix, i)] = getattr(obj, i)
+    for o in ['ack', 'err', 'dat_r']:
+        res['o_%s_%s' % (prefix, o)] = getattr(obj, o)
+    return res
 
 
 class LibreSoC(CPU):
     name                 = "libre_soc"
     human_name           = "Libre-SoC"
     variants             = CPU_VARIANTS
-    data_width           = 64
     endianness           = "little"
     gcc_triple           = ("powerpc64le-linux", "powerpc64le-linux-gnu")
     linker_output_format = "elf64-powerpcle"
@@ -43,14 +59,26 @@ class LibreSoC(CPU):
         self.platform     = platform
         self.variant      = variant
         self.reset        = Signal()
+        self.interrupt    = Signal(16)
+
+        if variant == "standard32":
+            self.data_width           = 32
+            self.dbus = dbus = wb.Interface(data_width=32, adr_width=30)
+        else:
+            self.dbus = dbus = wb.Interface(data_width=64, adr_width=29)
+            self.data_width           = 64
+        self.ibus = ibus = wb.Interface(data_width=64, adr_width=29)
 
-        self.ibus = ibus = wishbone.Interface(data_width=64, adr_width=29)
-        self.dbus = dbus = wishbone.Interface(data_width=64, adr_width=29)
+        self.xics_icp = icp = wb.Interface(data_width=32, adr_width=30)
+        self.xics_ics = ics = wb.Interface(data_width=32, adr_width=30)
+
+        if variant != "ls180":
+            self.simple_gpio = gpio = wb.Interface(data_width=32, adr_width=30)
 
         self.periph_buses = [ibus, dbus]
         self.memory_buses = []
 
-        self.dmi_addr = Signal(3)
+        self.dmi_addr = Signal(4)
         self.dmi_din = Signal(64)
         self.dmi_dout = Signal(64)
         self.dmi_wr = Signal(1)
@@ -64,32 +92,6 @@ class LibreSoC(CPU):
             i_clk              = ClockSignal(),
             i_rst              = ResetSignal() | self.reset,
 
-            # IBus
-            o_ibus__stb        = ibus.stb,
-            o_ibus__cyc        = ibus.cyc,
-            o_ibus__cti        = ibus.cti,
-            o_ibus__bte        = ibus.bte,
-            o_ibus__we         = ibus.we,
-            o_ibus__adr        = Cat(ibus.adr), # bytes to words addressing
-            o_ibus__dat_w      = ibus.dat_w,
-            o_ibus__sel        = ibus.sel,
-            i_ibus__ack        = ibus.ack,
-            i_ibus__err        = ibus.err,
-            i_ibus__dat_r      = ibus.dat_r,
-
-            # DBus
-            o_dbus__stb        = dbus.stb,
-            o_dbus__cyc        = dbus.cyc,
-            o_dbus__cti        = dbus.cti,
-            o_dbus__bte        = dbus.bte,
-            o_dbus__we         = dbus.we,
-            o_dbus__adr        = Cat(dbus.adr), # bytes to words addressing
-            o_dbus__dat_w      = dbus.dat_w,
-            o_dbus__sel        = dbus.sel,
-            i_dbus__ack        = dbus.ack,
-            i_dbus__err        = dbus.err,
-            i_dbus__dat_r      = dbus.dat_r,
-
             # Monitoring / Debugging
             i_pc_i             = 0,
             i_pc_i_ok          = 0,
@@ -97,6 +99,9 @@ class LibreSoC(CPU):
             o_busy_o           = Signal(),
             o_memerr_o         = Signal(),
 
+            # interrupts
+            i_int_level_i      = self.interrupt,
+
             # Debug bus
             i_dmi_addr_i          = self.dmi_addr,
             i_dmi_din             = self.dmi_din,
@@ -106,6 +111,14 @@ class LibreSoC(CPU):
             o_dmi_ack_o           = self.dmi_ack,
         )
 
+        # add wishbone buses to cpu params
+        self.cpu_params.update(make_wb_bus("ibus_", ibus))
+        self.cpu_params.update(make_wb_bus("dbus_", dbus))
+        self.cpu_params.update(make_wb_slave("ics_wb_", ics))
+        self.cpu_params.update(make_wb_slave("icp_wb_", icp))
+        if variant != "ls180":
+            self.cpu_params.update(make_wb_slave("gpio_wb_", gpio))
+
         # add verilog sources
         self.add_sources(platform)