for now use our fork of migen

This commit is contained in:
Florent Kermarrec 2015-11-13 14:48:42 +01:00
parent 886108eee9
commit 7b9dc92b0b
15 changed files with 47 additions and 47 deletions

View File

@ -7,8 +7,8 @@ import subprocess
import struct
import importlib
from migen.fhdl import verilog
from migen.fhdl.structure import _Fragment
from litex.gen.fhdl import verilog
from litex.gen.fhdl.structure import _Fragment
from litex.build.tools import write_to_file
from litex.build.xilinx.common import *

View File

@ -1,5 +1,5 @@
from migen.genlib.io import CRG
from migen.fhdl.specials import Keep
from litex.gen.genlib.io import CRG
from litex.gen.fhdl.specials import Keep
from litex.build.xilinx.vivado import XilinxVivadoToolchain
from litex.soc.interconnect import wishbone

View File

@ -1,11 +1,11 @@
import math
from collections import OrderedDict
from migen import *
from migen.genlib.resetsync import AsyncResetSynchronizer
from migen.genlib.record import *
from migen.genlib.fsm import FSM, NextState
from migen.genlib.misc import chooser, WaitTimer
from litex.gen import *
from litex.gen.genlib.resetsync import AsyncResetSynchronizer
from litex.gen.genlib.record import *
from litex.gen.genlib.fsm import FSM, NextState
from litex.gen.genlib.misc import chooser, WaitTimer
from litex.soc.interconnect.stream import *
from litex.soc.interconnect.packet import *

View File

@ -2,7 +2,7 @@ from liteeth.common import *
from litex.soc.cores.liteeth_mini.mac.frontend import sram
from litex.soc.interconnect import wishbone
from migen.fhdl.simplify import FullMemoryWE
from litex.gen.fhdl.simplify import FullMemoryWE
class LiteEthMACWishboneInterface(Module, AutoCSR):

View File

@ -1,4 +1,4 @@
from migen.genlib.io import DDROutput
from litex.gen.genlib.io import DDROutput
from liteeth.common import *

View File

@ -1,5 +1,5 @@
from migen.genlib.io import DDROutput
from migen.genlib.cdc import PulseSynchronizer
from litex.gen.genlib.io import DDROutput
from litex.gen.genlib.cdc import PulseSynchronizer
from litex.soc.interconnect.stream import Multiplexer, Demultiplexer

View File

@ -1,8 +1,8 @@
# RGMII PHY for Spartan-6
from migen.genlib.io import DDROutput
from migen.genlib.misc import WaitTimer
from migen.genlib.fsm import FSM, NextState
from litex.gen.genlib.io import DDROutput
from litex.gen.genlib.misc import WaitTimer
from litex.gen.genlib.fsm import FSM, NextState
from liteeth.common import *

View File

@ -1,7 +1,7 @@
from migen.fhdl.std import *
from migen.bus import wishbone
from migen.bus.transactions import *
from migen.sim.generic import run_simulation
from litex.gen.fhdl.std import *
from litex.gen.bus import wishbone
from litex.gen.bus.transactions import *
from litex.gen.sim.generic import run_simulation
from liteeth.common import *
from liteeth.core.mac import LiteEthMAC

View File

@ -1,9 +1,9 @@
import random
import copy
from migen.fhdl.std import *
from migen.flow.actor import Sink, Source
from migen.genlib.record import *
from litex.gen.fhdl.std import *
from litex.gen.flow.actor import Sink, Source
from litex.gen.genlib.record import *
from liteeth.common import *

View File

@ -1,7 +1,7 @@
from migen.fhdl.std import *
from migen.bus import wishbone
from migen.bus.transactions import *
from migen.sim.generic import run_simulation
from litex.gen.fhdl.std import *
from litex.gen.bus import wishbone
from litex.gen.bus.transactions import *
from litex.gen.sim.generic import run_simulation
from liteeth.common import *
from liteeth.core import LiteEthUDPIPCore

View File

@ -1,7 +1,7 @@
from migen.fhdl.std import *
from migen.bus import wishbone
from migen.bus.transactions import *
from migen.sim.generic import run_simulation
from litex.gen.fhdl.std import *
from litex.gen.bus import wishbone
from litex.gen.bus.transactions import *
from litex.gen.sim.generic import run_simulation
from liteeth.common import *
from liteeth.core import LiteEthIPCore

View File

@ -1,7 +1,7 @@
from migen.fhdl.std import *
from migen.bus import wishbone
from migen.bus.transactions import *
from migen.sim.generic import run_simulation
from litex.gen.fhdl.std import *
from litex.gen.bus import wishbone
from litex.gen.bus.transactions import *
from litex.gen.sim.generic import run_simulation
from liteeth.common import *
from liteeth.core import LiteEthIPCore

View File

@ -1,7 +1,7 @@
from migen.fhdl.std import *
from migen.bus import wishbone
from migen.bus.transactions import *
from migen.sim.generic import run_simulation
from litex.gen.fhdl.std import *
from litex.gen.bus import wishbone
from litex.gen.bus.transactions import *
from litex.gen.sim.generic import run_simulation
from liteeth.common import *
from liteeth.core.mac.core import LiteEthMACCore

View File

@ -1,7 +1,7 @@
from migen.fhdl.std import *
from migen.bus import wishbone
from migen.bus.transactions import *
from migen.sim.generic import run_simulation
from litex.gen.fhdl.std import *
from litex.gen.bus import wishbone
from litex.gen.bus.transactions import *
from litex.gen.sim.generic import run_simulation
from liteeth.common import *
from liteeth.core.mac import LiteEthMAC

View File

@ -1,7 +1,7 @@
from migen.fhdl.std import *
from migen.bus import wishbone
from migen.bus.transactions import *
from migen.sim.generic import run_simulation
from litex.gen.fhdl.std import *
from litex.gen.bus import wishbone
from litex.gen.bus.transactions import *
from litex.gen.sim.generic import run_simulation
from liteeth.common import *
from liteeth.core import LiteEthUDPIPCore