From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sat, 19 Sep 2020 15:00:37 +0000 (+0100)
Subject: urk. wishbone slave devices declared incorrectly (I/O inverted)
X-Git-Tag: semi_working_ecp5
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=24a31176943c4e846eaa192744c4df24bc4e11cd;hp=4513aaa71cdf62e2fd9787896e91c8f5df4aa0e9;p=soc.git

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

diff --git a/src/soc/litex/florent/libresoc/core.py b/src/soc/litex/florent/libresoc/core.py
index aae1966e..a9571eb5 100644
--- a/src/soc/litex/florent/libresoc/core.py
+++ b/src/soc/litex/florent/libresoc/core.py
@@ -16,6 +16,14 @@ def make_wb_bus(prefix, obj):
         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"
@@ -106,10 +114,10 @@ class LibreSoC(CPU):
         # 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_bus("ics_wb_", ics))
-        self.cpu_params.update(make_wb_bus("icp_wb_", icp))
+        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_bus("gpio_wb_", gpio))
+            self.cpu_params.update(make_wb_slave("gpio_wb_", gpio))
 
         # add verilog sources
         self.add_sources(platform)