corelogic -> genlib

diff --git a/milkymist/asmicon/bankmachine.py b/milkymist/asmicon/bankmachine.py
index de472919ae06d3ea22d3effcf0f3f563eb52655f..07244e97e22603f831e9b8d44a1f6c6493c2fe62 100644 (file)
--- a/milkymist/asmicon/bankmachine.py
+++ b/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 *
 

diff --git a/milkymist/asmicon/multiplexer.py b/milkymist/asmicon/multiplexer.py
index 6258e6b007df2c73909cf1df6a8e32e7477bc441..0f257841c6f130cf99d67a5d8d54ba53e9d65b3b 100644 (file)
--- a/milkymist/asmicon/multiplexer.py
+++ b/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):

diff --git a/milkymist/asmicon/refresher.py b/milkymist/asmicon/refresher.py
index 463f673aa447c3d076d1ef2e5a935c4b79207f81..641bb2321bb7bb45f0d05137d6a146688536f40b 100644 (file)
--- a/milkymist/asmicon/refresher.py
+++ b/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 *
 

diff --git a/milkymist/norflash/__init__.py b/milkymist/norflash/__init__.py
index 76b0a61c3ba838eb73cdb3797300ddd9d47c4d9c..e8e97f3124f4c3817d92fbd414be540bc760e2e8 100644 (file)
--- a/milkymist/norflash/__init__.py
+++ b/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):