From a184827632f32377e997b45a87a1a891142732bd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Fran=C3=A7ois=20Nguyen?= <jf@lambdaconcept.com>
Date: Thu, 26 Mar 2020 10:00:07 +0100
Subject: [PATCH] cpu: add MinervaCPU

---
 lambdasoc/cpu/__init__.py | 15 +++++++++++++
 lambdasoc/cpu/minerva.py  | 45 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 lambdasoc/cpu/__init__.py
 create mode 100644 lambdasoc/cpu/minerva.py

diff --git a/lambdasoc/cpu/__init__.py b/lambdasoc/cpu/__init__.py
new file mode 100644
index 0000000..343bc01
--- /dev/null
+++ b/lambdasoc/cpu/__init__.py
@@ -0,0 +1,15 @@
+from abc import ABCMeta, abstractproperty
+
+
+__all__ = ["CPU"]
+
+
+class CPU(metaclass=ABCMeta):
+    """TODO
+    """
+    name       = abstractproperty()
+    arch       = abstractproperty()
+    byteorder  = abstractproperty()
+    data_width = abstractproperty()
+    reset_addr = abstractproperty()
+    muldiv     = abstractproperty()
diff --git a/lambdasoc/cpu/minerva.py b/lambdasoc/cpu/minerva.py
new file mode 100644
index 0000000..a9abc49
--- /dev/null
+++ b/lambdasoc/cpu/minerva.py
@@ -0,0 +1,45 @@
+from nmigen import *
+from nmigen_soc import wishbone
+
+from minerva.core import Minerva
+
+from . import CPU
+
+
+__all__ = ["MinervaCPU"]
+
+
+class MinervaCPU(CPU, Elaboratable):
+    name       = "minerva"
+    arch       = "riscv"
+    byteorder  = "little"
+    data_width = 32
+
+    def __init__(self, **kwargs):
+        super().__init__()
+        self._cpu = Minerva(**kwargs)
+        self.ibus = wishbone.Interface(addr_width=30, data_width=32, granularity=8,
+                                       features={"err", "cti", "bte"})
+        self.dbus = wishbone.Interface(addr_width=30, data_width=32, granularity=8,
+                                       features={"err", "cti", "bte"})
+        self.ip   = Signal.like(self._cpu.external_interrupt)
+
+    @property
+    def reset_addr(self):
+        return self._cpu.reset_address
+
+    @property
+    def muldiv(self):
+        return "hard" if self._cpu.with_muldiv else "soft"
+
+    def elaborate(self, platform):
+        m = Module()
+
+        m.submodules.minerva = self._cpu
+        m.d.comb += [
+            self._cpu.ibus.connect(self.ibus),
+            self._cpu.dbus.connect(self.dbus),
+            self._cpu.external_interrupt.eq(self.ip),
+        ]
+
+        return m
-- 
2.30.2