Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 2 commits
  • 9 files changed
  • 0 comments
  • 1 contributor
6  milkymist/asmicon/bankmachine.py
... ...
@@ -1,8 +1,8 @@
1 1
 from migen.fhdl.structure import *
2 2
 from migen.bus.asmibus import *
3  
-from migen.corelogic.roundrobin import *
4  
-from migen.corelogic.fsm import FSM
5  
-from migen.corelogic.misc import optree
  3
+from migen.genlib.roundrobin import *
  4
+from migen.genlib.fsm import FSM
  5
+from migen.genlib.misc import optree
6 6
 
7 7
 from milkymist.asmicon.multiplexer import *
8 8
 
6  milkymist/asmicon/multiplexer.py
... ...
@@ -1,7 +1,7 @@
1 1
 from migen.fhdl.structure import *
2  
-from migen.corelogic.roundrobin import *
3  
-from migen.corelogic.misc import optree
4  
-from migen.corelogic.fsm import FSM
  2
+from migen.genlib.roundrobin import *
  3
+from migen.genlib.misc import optree
  4
+from migen.genlib.fsm import FSM
5 5
 
6 6
 class CommandRequest:
7 7
 	def __init__(self, a, ba):
4  milkymist/asmicon/refresher.py
... ...
@@ -1,6 +1,6 @@
1 1
 from migen.fhdl.structure import *
2  
-from migen.corelogic.misc import timeline
3  
-from migen.corelogic.fsm import FSM
  2
+from migen.genlib.misc import timeline
  3
+from migen.genlib.fsm import FSM
4 4
 
5 5
 from milkymist.asmicon.multiplexer import *
6 6
 
3  milkymist/framebuffer/__init__.py
... ...
@@ -1,4 +1,5 @@
1 1
 from migen.fhdl.structure import *
  2
+from migen.fhdl.specials import Instance
2 3
 from migen.flow.actor import *
3 4
 from migen.flow.network import *
4 5
 from migen.flow.transactions import *
@@ -155,7 +156,7 @@ def get_fragment(self):
155 156
 				
156 157
 				self.busy.eq(0)
157 158
 			],
158  
-			instances=[asfifo])
  159
+			specials={asfifo})
159 160
 
160 161
 def sim_fifo_gen():
161 162
 	while True:
3  milkymist/lm32/__init__.py
... ...
@@ -1,4 +1,5 @@
1 1
 from migen.fhdl.structure import *
  2
+from migen.fhdl.specials import Instance
2 3
 from migen.bus import wishbone
3 4
 
4 5
 class LM32:
@@ -49,4 +50,4 @@ def get_fragment(self):
49 50
 			self.ibus.adr.eq(self._i_adr_o[2:]),
50 51
 			self.dbus.adr.eq(self._d_adr_o[2:])
51 52
 		]
52  
-		return Fragment(comb=comb, instances=[self._inst])
  53
+		return Fragment(comb, specials={self._inst})
3  milkymist/m1crg/__init__.py
... ...
@@ -1,6 +1,7 @@
1 1
 from fractions import Fraction
2 2
 
3 3
 from migen.fhdl.structure import *
  4
+from migen.fhdl.specials import Instance
4 5
 from mibuild.crg import CRG
5 6
 
6 7
 class M1CRG(CRG):
@@ -58,4 +59,4 @@ def __init__(self, infreq, outfreq1x):
58 59
 		self._inst = Instance("m1crg", *inst_items)
59 60
 
60 61
 	def get_fragment(self):
61  
-		return Fragment(instances=[self._inst])
  62
+		return Fragment(specials={self._inst})
7  milkymist/minimac3/__init__.py
... ...
@@ -1,4 +1,5 @@
1 1
 from migen.fhdl.structure import *
  2
+from migen.fhdl.specials import Instance
2 3
 from migen.bank.description import *
3 4
 from migen.bank.eventmanager import *
4 5
 from migen.bank import csrgen
@@ -59,8 +60,7 @@ def get_fragment(self):
59 60
 			rx_pending_0_r.eq(rx_pending_0),
60 61
 			rx_pending_1_r.eq(rx_pending_1)
61 62
 		]
62  
-		inst = [
63  
-			Instance("minimac3",
  63
+		inst = Instance("minimac3",
64 64
 				Instance.ClockPort("sys_clk"),
65 65
 				Instance.ResetPort("sys_rst"),
66 66
 
@@ -94,7 +94,6 @@ def get_fragment(self):
94 94
 				Instance.Input("phy_rx_er", self.phy_rx_er),
95 95
 				Instance.Input("phy_col", self.phy_col),
96 96
 				Instance.Input("phy_crs", self.phy_crs))
97  
-		]
98  
-		return Fragment(comb, sync, instances=inst) \
  97
+		return Fragment(comb, sync, specials={inst}) \
99 98
 			+ self.events.get_fragment() \
100 99
 			+ self.bank.get_fragment()
2  milkymist/norflash/__init__.py
... ...
@@ -1,6 +1,6 @@
1 1
 from migen.fhdl.structure import *
2 2
 from migen.bus import wishbone
3  
-from migen.corelogic.misc import timeline
  3
+from migen.genlib.misc import timeline
4 4
 
5 5
 class NorFlash:
6 6
 	def __init__(self, adr_width, rd_timing):
3  milkymist/s6ddrphy/__init__.py
... ...
@@ -1,4 +1,5 @@
1 1
 from migen.fhdl.structure import *
  2
+from migen.fhdl.specials import Instance
2 3
 from migen.bus import dfi
3 4
 
4 5
 class S6DDRPHY:
@@ -41,4 +42,4 @@ def __init__(self, a, ba, d):
41 42
 		self._inst = Instance("s6ddrphy", *inst_items)
42 43
 
43 44
 	def get_fragment(self):
44  
-		return Fragment(instances=[self._inst])
  45
+		return Fragment(specials={self._inst})

No commit comments for this range

Something went wrong with that request. Please try again.