From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Thu, 6 Sep 2018 14:40:30 +0000 (+0200)
Subject: cpu/minerva: add workaround on import until code is released
X-Git-Tag: 24jan2021_ls180~1624
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb24ac0ecc158bd1f7b69649bfafc356a709e5a3;p=litex.git

cpu/minerva: add workaround on import until code is released
---

diff --git a/litex/soc/cores/cpu/minerva/core.py b/litex/soc/cores/cpu/minerva/core.py
index 787c91ec..8ae8623b 100644
--- a/litex/soc/cores/cpu/minerva/core.py
+++ b/litex/soc/cores/cpu/minerva/core.py
@@ -4,8 +4,6 @@ from migen import *
 
 from litex.soc.interconnect import wishbone
 
-from minerva.core import Minerva as MinervaCPU
-
 
 class Minerva(Module):
     def __init__(self, platform, cpu_reset_address, variant=None):
@@ -17,10 +15,15 @@ class Minerva(Module):
 
         ###
 
-        self.submodules.cpu = MinervaCPU(reset_address=cpu_reset_address)
-        self.comb += [
-            self.cpu.reset.eq(self.reset),
-            self.cpu.external_interrupt.eq(self.interrupt),
-            self.cpu.ibus.connect(self.ibus),
-            self.cpu.dbus.connect(self.dbus)
-        ]
+        try: # FIXME: workaround until Minerva code is released
+            from minerva.core import Minerva as MinervaCPU
+            self.submodules.cpu = MinervaCPU(reset_address=cpu_reset_address)
+            self.comb += [
+                self.cpu.reset.eq(self.reset),
+                self.cpu.external_interrupt.eq(self.interrupt),
+                self.cpu.ibus.connect(self.ibus),
+                self.cpu.dbus.connect(self.dbus)
+            ]
+        except:
+            pass
+