remove wb err signal from sram4k
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Wed, 26 May 2021 14:04:23 +0000 (15:04 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Wed, 26 May 2021 14:04:23 +0000 (15:04 +0100)
libresoc/core.py

index 35aac19746a0b324d92f0a1dcd15fb64e40243d1..853191f3554583d6725590daf014326f3f3a61f3 100644 (file)
@@ -25,14 +25,17 @@ def make_wb_bus(prefix, obj, simple=False):
         res['i_%s__%s' % (prefix, i)] = getattr(obj, i)
     return res
 
-def make_wb_slave(prefix, obj, simple=False):
+def make_wb_slave(prefix, obj, simple=False, err=True):
     res = {}
     inpins = ['stb', 'cyc', 'we', 'adr', 'dat_w', 'sel']
     if not simple:
         inpins += ['cti', 'bte']
     for i in inpins:
         res['i_%s__%s' % (prefix, i)] = getattr(obj, i)
-    for o in ['ack', 'err', 'dat_r']:
+    outpins = ['ack', 'dat_r']
+    if err:
+        outpins.append('err')
+    for o in outpins:
         res['o_%s__%s' % (prefix, o)] = getattr(obj, o)
     return res
 
@@ -289,7 +292,8 @@ class LibreSoC(CPU):
         if "sram4k" in variant:
             for i, sram in enumerate(srams):
                 self.cpu_params.update(make_wb_slave("sram4k_%d_wb" % i,
-                                                     sram, simple=True))
+                                                     sram, simple=True,
+                                                     err=False))
 
         # and set ibus advanced tags to zero (disable)
         self.cpu_params['i_ibus__cti'] = 0