From 24ef9d7ebe3ab81ef861bc02eae47d24dda24c70 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Fri, 13 Nov 2015 15:46:08 +0100 Subject: [PATCH] for now use our fork of migen --- example_designs/make.py | 4 ++-- example_designs/targets/core.py | 4 ++-- example_designs/targets/simple.py | 2 +- litescope/common.py | 6 +++--- litescope/software/driver/logic_analyzer.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example_designs/make.py b/example_designs/make.py index 4948150..f8be1d9 100644 --- a/example_designs/make.py +++ b/example_designs/make.py @@ -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 * diff --git a/example_designs/targets/core.py b/example_designs/targets/core.py index 316890a..5694200 100644 --- a/example_designs/targets/core.py +++ b/example_designs/targets/core.py @@ -1,5 +1,5 @@ -from migen import * -from migen.genlib.io import CRG +from litex.gen import * +from litex.gen.genlib.io import CRG from targets import * diff --git a/example_designs/targets/simple.py b/example_designs/targets/simple.py index 85b0e47..9bc950c 100644 --- a/example_designs/targets/simple.py +++ b/example_designs/targets/simple.py @@ -1,4 +1,4 @@ -from migen.genlib.io import CRG +from litex.gen.genlib.io import CRG from litescope.common import * from litescope.core.port import LiteScopeTerm diff --git a/litescope/common.py b/litescope/common.py index 0df1f45..890ec44 100644 --- a/litescope/common.py +++ b/litescope/common.py @@ -1,6 +1,6 @@ -from migen import * -from migen.genlib.fsm import FSM, NextState -from migen.fhdl.specials import Memory +from litex.gen import * +from litex.gen.genlib.fsm import FSM, NextState +from litex.gen.fhdl.specials import Memory from litex.soc.interconnect.csr import * from litex.soc.interconnect.stream import * diff --git a/litescope/software/driver/logic_analyzer.py b/litescope/software/driver/logic_analyzer.py index 2942b3a..2a54e8a 100644 --- a/litescope/software/driver/logic_analyzer.py +++ b/litescope/software/driver/logic_analyzer.py @@ -1,5 +1,5 @@ from struct import * -from migen.fhdl.structure import * +from litex.gen.fhdl.structure import * from litescope.software.dump import * from litescope.software.driver.truthtable import *