Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Florent Kermarrec 2018-09-06 16:40:30 +02:00
parent 9cfae4dfde
commit fb24ac0ecc
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
litex/soc/cores/cpu/minerva/core.py
View File

@ -4,8 +4,6 @@ from migen import *
from litex.soc.interconnect import wishbone from litex.soc.interconnect import wishbone
from minerva.core import Minerva as MinervaCPU
class Minerva(Module): class Minerva(Module):
def __init__(self, platform, cpu_reset_address, variant=None): 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) try: # FIXME: workaround until Minerva code is released
self.comb += [ from minerva.core import Minerva as MinervaCPU
self.cpu.reset.eq(self.reset), self.submodules.cpu = MinervaCPU(reset_address=cpu_reset_address)
self.cpu.external_interrupt.eq(self.interrupt), self.comb += [
self.cpu.ibus.connect(self.ibus), self.cpu.reset.eq(self.reset),
self.cpu.dbus.connect(self.dbus) self.cpu.external_interrupt.eq(self.interrupt),
] self.cpu.ibus.connect(self.ibus),
self.cpu.dbus.connect(self.dbus)
]
except:
pass