From 9d5e605df3e5f1d54609acc5a2f10764045127e9 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Fri, 23 Feb 2018 13:43:47 +0100 Subject: [PATCH] replace litex.gen imports with migen imports --- example_designs/make.py | 4 ++-- example_designs/targets/core.py | 4 ++-- example_designs/targets/simple.py | 4 ++-- litescope/core.py | 4 ++-- litescope/software/driver/analyzer.py | 3 ++- test/test_analyzer.py | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/example_designs/make.py b/example_designs/make.py index e18fd6a..c4cef80 100755 --- a/example_designs/make.py +++ b/example_designs/make.py @@ -7,8 +7,8 @@ import subprocess import struct import importlib -from litex.gen.fhdl import verilog -from litex.gen.fhdl.structure import _Fragment +from migen.fhdl import verilog +from migen.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 b2506c9..b40fc54 100644 --- a/example_designs/targets/core.py +++ b/example_designs/targets/core.py @@ -1,5 +1,5 @@ -from litex.gen import * -from litex.gen.genlib.io import CRG +from migen import * +from migen.genlib.io import CRG from targets import * diff --git a/example_designs/targets/simple.py b/example_designs/targets/simple.py index 3e5b649..3230013 100644 --- a/example_designs/targets/simple.py +++ b/example_designs/targets/simple.py @@ -1,5 +1,5 @@ -from litex.gen import * -from litex.gen.genlib.io import CRG +from migen import * +from migen.genlib.io import CRG from litex.soc.integration.soc_core import SoCCore from litex.soc.cores.uart import UARTWishboneBridge diff --git a/litescope/core.py b/litescope/core.py index b565aa1..42c0ad0 100644 --- a/litescope/core.py +++ b/litescope/core.py @@ -1,5 +1,5 @@ -from litex.gen import * -from litex.gen.genlib.cdc import MultiReg +from migen import * +from migen.genlib.cdc import MultiReg from litex.build.tools import write_to_file diff --git a/litescope/software/driver/analyzer.py b/litescope/software/driver/analyzer.py index f8a7c03..eb65e40 100644 --- a/litescope/software/driver/analyzer.py +++ b/litescope/software/driver/analyzer.py @@ -1,7 +1,8 @@ import os import sys -from litex.gen.fhdl.structure import * +from migen.fhdl.structure import * + from litescope.software.dump.common import * from litescope.software.dump import * diff --git a/test/test_analyzer.py b/test/test_analyzer.py index f351018..ef788cd 100644 --- a/test/test_analyzer.py +++ b/test/test_analyzer.py @@ -1,6 +1,6 @@ import unittest -from litex.gen import * +from migen import * from litescope import LiteScopeAnalyzer