Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 9 files changed
  • 0 commit comments
  • 1 contributor
View
6 milkymist/asmicon/bankmachine.py
@@ -1,8 +1,8 @@
from migen.fhdl.structure import *
from migen.bus.asmibus import *
-from migen.corelogic.roundrobin import *
-from migen.corelogic.fsm import FSM
-from migen.corelogic.misc import optree
+from migen.genlib.roundrobin import *
+from migen.genlib.fsm import FSM
+from migen.genlib.misc import optree
from milkymist.asmicon.multiplexer import *
View
6 milkymist/asmicon/multiplexer.py
@@ -1,7 +1,7 @@
from migen.fhdl.structure import *
-from migen.corelogic.roundrobin import *
-from migen.corelogic.misc import optree
-from migen.corelogic.fsm import FSM
+from migen.genlib.roundrobin import *
+from migen.genlib.misc import optree
+from migen.genlib.fsm import FSM
class CommandRequest:
def __init__(self, a, ba):
View
4 milkymist/asmicon/refresher.py
@@ -1,6 +1,6 @@
from migen.fhdl.structure import *
-from migen.corelogic.misc import timeline
-from migen.corelogic.fsm import FSM
+from migen.genlib.misc import timeline
+from migen.genlib.fsm import FSM
from milkymist.asmicon.multiplexer import *
View
3  milkymist/framebuffer/__init__.py
@@ -1,4 +1,5 @@
from migen.fhdl.structure import *
+from migen.fhdl.specials import Instance
from migen.flow.actor import *
from migen.flow.network import *
from migen.flow.transactions import *
@@ -155,7 +156,7 @@ def get_fragment(self):
self.busy.eq(0)
],
- instances=[asfifo])
+ specials={asfifo})
def sim_fifo_gen():
while True:
View
3  milkymist/lm32/__init__.py
@@ -1,4 +1,5 @@
from migen.fhdl.structure import *
+from migen.fhdl.specials import Instance
from migen.bus import wishbone
class LM32:
@@ -49,4 +50,4 @@ def get_fragment(self):
self.ibus.adr.eq(self._i_adr_o[2:]),
self.dbus.adr.eq(self._d_adr_o[2:])
]
- return Fragment(comb=comb, instances=[self._inst])
+ return Fragment(comb, specials={self._inst})
View
3  milkymist/m1crg/__init__.py
@@ -1,6 +1,7 @@
from fractions import Fraction
from migen.fhdl.structure import *
+from migen.fhdl.specials import Instance
from mibuild.crg import CRG
class M1CRG(CRG):
@@ -58,4 +59,4 @@ def __init__(self, infreq, outfreq1x):
self._inst = Instance("m1crg", *inst_items)
def get_fragment(self):
- return Fragment(instances=[self._inst])
+ return Fragment(specials={self._inst})
View
7 milkymist/minimac3/__init__.py
@@ -1,4 +1,5 @@
from migen.fhdl.structure import *
+from migen.fhdl.specials import Instance
from migen.bank.description import *
from migen.bank.eventmanager import *
from migen.bank import csrgen
@@ -59,8 +60,7 @@ def get_fragment(self):
rx_pending_0_r.eq(rx_pending_0),
rx_pending_1_r.eq(rx_pending_1)
]
- inst = [
- Instance("minimac3",
+ inst = Instance("minimac3",
Instance.ClockPort("sys_clk"),
Instance.ResetPort("sys_rst"),
@@ -94,7 +94,6 @@ def get_fragment(self):
Instance.Input("phy_rx_er", self.phy_rx_er),
Instance.Input("phy_col", self.phy_col),
Instance.Input("phy_crs", self.phy_crs))
- ]
- return Fragment(comb, sync, instances=inst) \
+ return Fragment(comb, sync, specials={inst}) \
+ self.events.get_fragment() \
+ self.bank.get_fragment()
View
2  milkymist/norflash/__init__.py
@@ -1,6 +1,6 @@
from migen.fhdl.structure import *
from migen.bus import wishbone
-from migen.corelogic.misc import timeline
+from migen.genlib.misc import timeline
class NorFlash:
def __init__(self, adr_width, rd_timing):
View
3  milkymist/s6ddrphy/__init__.py
@@ -1,4 +1,5 @@
from migen.fhdl.structure import *
+from migen.fhdl.specials import Instance
from migen.bus import dfi
class S6DDRPHY:
@@ -41,4 +42,4 @@ def __init__(self, a, ba, d):
self._inst = Instance("s6ddrphy", *inst_items)
def get_fragment(self):
- return Fragment(instances=[self._inst])
+ return Fragment(specials={self._inst})

No commit comments for this range

Something went wrong with that request. Please try again.