disable gpio in litex core

diff --git a/src/soc/litex/florent/libresoc/core.py b/src/soc/litex/florent/libresoc/core.py
index 3bc76798f64cc170f5672336e17c9169bb774920..9703cbfee6127cbe3a78e002aeb3c92542e9f2e3 100644 (file)
--- a/src/soc/litex/florent/libresoc/core.py
+++ b/src/soc/litex/florent/libresoc/core.py
@@ -166,7 +166,7 @@ class LibreSoC(CPU):
 
         jtag_en = ('jtag' in variant) or variant == 'ls180'
 
-        if variant != "ls180":
+        if "gpiotest" in variant:
             self.simple_gpio = gpio = wb.Interface(data_width=32, adr_width=30)
         if jtag_en:
             self.jtag_wb = jtag_wb = wb.Interface(data_width=64, adr_width=29)
@@ -240,7 +240,7 @@ class LibreSoC(CPU):
         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":
+        if "gpiotest" in variant:
             self.cpu_params.update(make_wb_slave("gpio_wb", gpio))
         if jtag_en:
             self.cpu_params.update(make_wb_bus("jtag_wb", jtag_wb, simple=True))

diff --git a/src/soc/litex/florent/versa_ecp5.py b/src/soc/litex/florent/versa_ecp5.py
index e2e31d14e257c3181d11df86e5f8a6d135d3c801..c9938fea3fc8a70b8ca30c7e29bed099059e226d 100755 (executable)
--- a/src/soc/litex/florent/versa_ecp5.py
+++ b/src/soc/litex/florent/versa_ecp5.py
@@ -30,6 +30,7 @@ class VersaECP5TestSoC(versa_ecp5.BaseSoC):
             cpu_type     = "external",
             cpu_cls      = LibreSoC,
             cpu_variant  = "standardjtag",
+            cpu_variant = "standardjtagnoirq",
             #cpu_cls      = Microwatt,
             device       = "LFE5UM",
             **kwargs)