liteeth: fix import (from liteeth --> from misoclib.liteeth)

diff --git a/misoclib/liteeth/core/__init__.py b/misoclib/liteeth/core/__init__.py
index 4d9b7147ac01fa538798ec225ffe67410a41516c..642dcb2991cee0014bbe4ae0e63b2d54b20806d1 100644 (file)
--- a/misoclib/liteeth/core/__init__.py
+++ b/misoclib/liteeth/core/__init__.py
@@ -1,10 +1,10 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.mac import LiteEthMAC
-from liteeth.core.arp import LiteEthARP
-from liteeth.core.ip import LiteEthIP
-from liteeth.core.udp import LiteEthUDP
-from liteeth.core.icmp import LiteEthICMP
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.mac import LiteEthMAC
+from misoclib.liteeth.core.arp import LiteEthARP
+from misoclib.liteeth.core.ip import LiteEthIP
+from misoclib.liteeth.core.udp import LiteEthUDP
+from misoclib.liteeth.core.icmp import LiteEthICMP
 
 class LiteEthIPCore(Module, AutoCSR):
        def __init__(self, phy, mac_address, ip_address, clk_freq):

diff --git a/misoclib/liteeth/core/arp/__init__.py b/misoclib/liteeth/core/arp/__init__.py
index 638505c35f38188018a7a612e374227dce304bbf..82f4fc77ad0c10ce9fb13e4c8ce981430db90d25 100644 (file)
--- a/misoclib/liteeth/core/arp/__init__.py
+++ b/misoclib/liteeth/core/arp/__init__.py
@@ -1,7 +1,7 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.generic.depacketizer import LiteEthDepacketizer
-from liteeth.generic.packetizer import LiteEthPacketizer
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer
+from misoclib.liteeth.generic.packetizer import LiteEthPacketizer
 
 _arp_table_layout = [
                ("reply", 1),

diff --git a/misoclib/liteeth/core/etherbone/__init__.py b/misoclib/liteeth/core/etherbone/__init__.py
index 78f3d738cd5db6c441ec42b019b16761e7a3a743..09ffcb6022d3e27576fd21b5aad6fec6929bf010 100644 (file)
--- a/misoclib/liteeth/core/etherbone/__init__.py
+++ b/misoclib/liteeth/core/etherbone/__init__.py
@@ -1,11 +1,11 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.generic.arbiter import Arbiter
-from liteeth.generic.dispatcher import Dispatcher
-from liteeth.core.etherbone.packet import *
-from liteeth.core.etherbone.probe import *
-from liteeth.core.etherbone.record import *
-from liteeth.core.etherbone.wishbone import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.generic.arbiter import Arbiter
+from misoclib.liteeth.generic.dispatcher import Dispatcher
+from misoclib.liteeth.core.etherbone.packet import *
+from misoclib.liteeth.core.etherbone.probe import *
+from misoclib.liteeth.core.etherbone.record import *
+from misoclib.liteeth.core.etherbone.wishbone import *
 
 class LiteEthEtherbone(Module):
        def __init__(self, udp, udp_port):

diff --git a/misoclib/liteeth/core/etherbone/packet.py b/misoclib/liteeth/core/etherbone/packet.py
index 22f72c5a57f19603cafe710fddcccdce2e45ebbd..79a6cd7c17c47993a20a55f5cbb3b5915db2dddb 100644 (file)
--- a/misoclib/liteeth/core/etherbone/packet.py
+++ b/misoclib/liteeth/core/etherbone/packet.py
@@ -1,7 +1,7 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.generic.depacketizer import LiteEthDepacketizer
-from liteeth.generic.packetizer import LiteEthPacketizer
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer
+from misoclib.liteeth.generic.packetizer import LiteEthPacketizer
 
 class LiteEthEtherbonePacketPacketizer(LiteEthPacketizer):
        def __init__(self):

diff --git a/misoclib/liteeth/core/etherbone/probe.py b/misoclib/liteeth/core/etherbone/probe.py
index 04eb9f6a2e45a5609ee6f09d694304b51312af32..465ced5f39fed1c5c2809b74e2850274c52225ce 100644 (file)
--- a/misoclib/liteeth/core/etherbone/probe.py
+++ b/misoclib/liteeth/core/etherbone/probe.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthEtherboneProbe(Module):
        def __init__(self):

diff --git a/misoclib/liteeth/core/etherbone/record.py b/misoclib/liteeth/core/etherbone/record.py
index 77bc0378dc285e1aa5a760ca4908cbb53404fa3f..db0d6d527929f88d4a07d5222a8b6a24fee8478e 100644 (file)
--- a/misoclib/liteeth/core/etherbone/record.py
+++ b/misoclib/liteeth/core/etherbone/record.py
@@ -1,7 +1,7 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.generic.depacketizer import LiteEthDepacketizer
-from liteeth.generic.packetizer import LiteEthPacketizer
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer
+from misoclib.liteeth.generic.packetizer import LiteEthPacketizer
 
 class LiteEthEtherboneRecordPacketizer(LiteEthPacketizer):
        def __init__(self):

diff --git a/misoclib/liteeth/core/etherbone/wishbone.py b/misoclib/liteeth/core/etherbone/wishbone.py
index 2f5b17622062833433ae263c865bc25f51f88efa..4d3f04cc07b40506eee10ec039127b3468b81d59 100644 (file)
--- a/misoclib/liteeth/core/etherbone/wishbone.py
+++ b/misoclib/liteeth/core/etherbone/wishbone.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 from migen.bus import wishbone
 
 class LiteEthEtherboneWishboneMaster(Module):

diff --git a/misoclib/liteeth/core/icmp/__init__.py b/misoclib/liteeth/core/icmp/__init__.py
index 0af3b62402c23320277e554902c766276a7c5166..611d84824561efe42f64159e3a423fd2a25b0ef5 100644 (file)
--- a/misoclib/liteeth/core/icmp/__init__.py
+++ b/misoclib/liteeth/core/icmp/__init__.py
@@ -1,7 +1,7 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.generic.depacketizer import LiteEthDepacketizer
-from liteeth.generic.packetizer import LiteEthPacketizer
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer
+from misoclib.liteeth.generic.packetizer import LiteEthPacketizer
 
 class LiteEthICMPPacketizer(LiteEthPacketizer):
        def __init__(self):

diff --git a/misoclib/liteeth/core/ip/__init__.py b/misoclib/liteeth/core/ip/__init__.py
index 4e24f186f9e4156375f0406d00db069d7e669143..ca7bbf318bbf57b4f6c5e691ab39629f4d7adbfb 100644 (file)
--- a/misoclib/liteeth/core/ip/__init__.py
+++ b/misoclib/liteeth/core/ip/__init__.py
@@ -1,9 +1,9 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.core.ip.checksum import *
-from liteeth.core.ip.crossbar import *
-from liteeth.generic.depacketizer import LiteEthDepacketizer
-from liteeth.generic.packetizer import LiteEthPacketizer
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.core.ip.checksum import *
+from misoclib.liteeth.core.ip.crossbar import *
+from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer
+from misoclib.liteeth.generic.packetizer import LiteEthPacketizer
 
 class LiteEthIPV4Packetizer(LiteEthPacketizer):
        def __init__(self):

diff --git a/misoclib/liteeth/core/ip/checksum.py b/misoclib/liteeth/core/ip/checksum.py
index f0e187e6545b0de29785f3da8725bd7c34d3d415..f6371c42bed62d95dd06cfba05bb3988420ff1fb 100644 (file)
--- a/misoclib/liteeth/core/ip/checksum.py
+++ b/misoclib/liteeth/core/ip/checksum.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthIPV4Checksum(Module):
        def __init__(self, words_per_clock_cycle=1, skip_checksum=False):

diff --git a/misoclib/liteeth/core/ip/crossbar.py b/misoclib/liteeth/core/ip/crossbar.py
index 19e88b2e86a0dce3ca5326cf9d9c6b628b9c06fa..a49ee14ee6b707546bba68a1699a5333f02a89d0 100644 (file)
--- a/misoclib/liteeth/core/ip/crossbar.py
+++ b/misoclib/liteeth/core/ip/crossbar.py
@@ -1,6 +1,6 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.generic.crossbar import LiteEthCrossbar
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.generic.crossbar import LiteEthCrossbar
 
 class LiteEthIPV4MasterPort:
        def __init__(self, dw):

diff --git a/misoclib/liteeth/core/tty/__init__.py b/misoclib/liteeth/core/tty/__init__.py
index a0102c4f287e1538fb478aab30a009570ebcf53e..82bf5a0d6aba1eaae1ba4d7a32c2ca7591781b70 100644 (file)
--- a/misoclib/liteeth/core/tty/__init__.py
+++ b/misoclib/liteeth/core/tty/__init__.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthTTYTX(Module):
        def __init__(self, ip_address, udp_port, fifo_depth=None):

diff --git a/misoclib/liteeth/core/udp/__init__.py b/misoclib/liteeth/core/udp/__init__.py
index 1873d76f81139ac21d98ccffb7825cfb0d75f340..1ff850fae386185c3d711d3ad1858530d780a2b6 100644 (file)
--- a/misoclib/liteeth/core/udp/__init__.py
+++ b/misoclib/liteeth/core/udp/__init__.py
@@ -1,8 +1,8 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.core.udp.crossbar import *
-from liteeth.generic.depacketizer import LiteEthDepacketizer
-from liteeth.generic.packetizer import LiteEthPacketizer
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.core.udp.crossbar import *
+from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer
+from misoclib.liteeth.generic.packetizer import LiteEthPacketizer
 
 class LiteEthUDPPacketizer(LiteEthPacketizer):
        def __init__(self):

diff --git a/misoclib/liteeth/core/udp/crossbar.py b/misoclib/liteeth/core/udp/crossbar.py
index 82843498daa7e86eafa5e002853dcf29f30a8083..191fe43ad639fb5e6e4f6fabaf3ec988251186ac 100644 (file)
--- a/misoclib/liteeth/core/udp/crossbar.py
+++ b/misoclib/liteeth/core/udp/crossbar.py
@@ -1,7 +1,7 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
-from liteeth.generic.crossbar import LiteEthCrossbar
+from misoclib.liteeth.generic.crossbar import LiteEthCrossbar
 
 class LiteEthUDPMasterPort:
        def __init__(self, dw):

diff --git a/misoclib/liteeth/example_designs/make.py b/misoclib/liteeth/example_designs/make.py
index c55c83398c0406da09c99a93240c6cee4f85fb08..7c4bb9d7cd6a65fdfa7a7c209414d0e79b1cb307 100644 (file)
--- a/misoclib/liteeth/example_designs/make.py
+++ b/misoclib/liteeth/example_designs/make.py
@@ -10,7 +10,7 @@ from migen.bank.description import CSRStatus
 from mibuild import tools
 from mibuild.xilinx_common import *
 
-from liteeth.common import *
+from misoclib.liteeth.common import *
 
 def get_csr_csv(regions):
        r = ""

diff --git a/misoclib/liteeth/example_designs/targets/base.py b/misoclib/liteeth/example_designs/targets/base.py
index 3fe1f2a4dc4ea8b73b6a11901f11f1d17a88643a..6c6720d09406d63e259599876e4a10dc8a5c7e7c 100644 (file)
--- a/misoclib/liteeth/example_designs/targets/base.py
+++ b/misoclib/liteeth/example_designs/targets/base.py
@@ -14,10 +14,10 @@ from litescope.bridge.uart2wb import LiteScopeUART2WB
 from litescope.frontend.la import LiteScopeLA
 from litescope.core.port import LiteScopeTerm
 
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.phy.gmii import LiteEthPHYGMII
-from liteeth.core import LiteEthUDPIPCore
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.phy.gmii import LiteEthPHYGMII
+from misoclib.liteeth.core import LiteEthUDPIPCore
 
 class _CRG(Module):
        def __init__(self, platform):

diff --git a/misoclib/liteeth/example_designs/targets/etherbone.py b/misoclib/liteeth/example_designs/targets/etherbone.py
index 0aaaf2d2ac3da2caf77b020009944672a9c48f3a..74b1cbc52f07bf1fdd31c9628fa54af6f1e1e659 100644 (file)
--- a/misoclib/liteeth/example_designs/targets/etherbone.py
+++ b/misoclib/liteeth/example_designs/targets/etherbone.py
@@ -2,11 +2,11 @@ from litescope.common import *
 from litescope.frontend.la import LiteScopeLA
 from litescope.core.port import LiteScopeTerm
 
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 from targets.base import BaseSoC
-from liteeth.core.etherbone import LiteEthEtherbone
+from misoclib.liteeth.core.etherbone import LiteEthEtherbone
 
 class EtherboneSoC(BaseSoC):
        default_platform = "kc705"

diff --git a/misoclib/liteeth/example_designs/targets/tty.py b/misoclib/liteeth/example_designs/targets/tty.py
index 28cda9d8f19554aecbc329a5acab91e5701b6c95..43e336271f06f2bd5a2e3f90e77b5f5aabc9be26 100644 (file)
--- a/misoclib/liteeth/example_designs/targets/tty.py
+++ b/misoclib/liteeth/example_designs/targets/tty.py
@@ -2,11 +2,11 @@ from litescope.common import *
 from litescope.frontend.la import LiteScopeLA
 from litescope.core.port import LiteScopeTerm
 
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 from targets.base import BaseSoC
-from liteeth.core.tty import LiteEthTTY
+from misoclib.liteeth.core.tty import LiteEthTTY
 
 class TTYSoC(BaseSoC):
        default_platform = "kc705"

diff --git a/misoclib/liteeth/example_designs/targets/udp.py b/misoclib/liteeth/example_designs/targets/udp.py
index 9ce15ce53eb1060bb0cf3f07ba218a3edeea8701..ae297973799df7efdc6ea729a6a776b908ac0f68 100644 (file)
--- a/misoclib/liteeth/example_designs/targets/udp.py
+++ b/misoclib/liteeth/example_designs/targets/udp.py
@@ -2,8 +2,8 @@ from litescope.common import *
 from litescope.frontend.la import LiteScopeLA
 from litescope.core.port import LiteScopeTerm
 
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 from targets.base import BaseSoC
 

diff --git a/misoclib/liteeth/example_designs/test/test_etherbone.py b/misoclib/liteeth/example_designs/test/test_etherbone.py
index 4622d524266d23026415f9e8be12765cb96fbd81..444aca9fd9eebcd5be02ee9b7471a8eed9cf1566 100644 (file)
--- a/misoclib/liteeth/example_designs/test/test_etherbone.py
+++ b/misoclib/liteeth/example_designs/test/test_etherbone.py
@@ -1,5 +1,5 @@
 import socket, time
-from liteeth.test.model.etherbone import *
+from misoclib.liteeth.test.model.etherbone import *
 
 SRAM_BASE = 0x02000000
 

diff --git a/misoclib/liteeth/generic/__init__.py b/misoclib/liteeth/generic/__init__.py
index 643e98720d9d7fc7c1a02b0963327d675c124d78..8de59192e80245a7cb70f6a17e79afb4584ba3cb 100644 (file)
--- a/misoclib/liteeth/generic/__init__.py
+++ b/misoclib/liteeth/generic/__init__.py
@@ -1,4 +1,4 @@
-from liteeth.common import *
+from misoclib.liteeth.common import *
 
 # Generic classes
 class Port:

diff --git a/misoclib/liteeth/generic/crossbar.py b/misoclib/liteeth/generic/crossbar.py
index b60da949469a5fa374183b21812cec7257884b25..0464d02981d2b2855a58530b62f5fcf6f2bb1931 100644 (file)
--- a/misoclib/liteeth/generic/crossbar.py
+++ b/misoclib/liteeth/generic/crossbar.py
@@ -1,9 +1,9 @@
 from collections import OrderedDict
 
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.generic.arbiter import Arbiter
-from liteeth.generic.dispatcher import Dispatcher
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.generic.arbiter import Arbiter
+from misoclib.liteeth.generic.dispatcher import Dispatcher
 
 class LiteEthCrossbar(Module):
        def __init__(self, master_port, dispatch_param):

diff --git a/misoclib/liteeth/generic/depacketizer.py b/misoclib/liteeth/generic/depacketizer.py
index 2d8ca86ca00a36f5fece9a599f3f6b2e4127032b..cb5a08d220dc88dff4d645ef86c76440380c85fe 100644 (file)
--- a/misoclib/liteeth/generic/depacketizer.py
+++ b/misoclib/liteeth/generic/depacketizer.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 def _decode_header(h_dict, h_signal, obj):
        r = []

diff --git a/misoclib/liteeth/generic/packetizer.py b/misoclib/liteeth/generic/packetizer.py
index 418da8146dcdedf07db84a97e973523425f29953..f80a55c106a1a33aae0ea25132dc43f1a0c5bcbf 100644 (file)
--- a/misoclib/liteeth/generic/packetizer.py
+++ b/misoclib/liteeth/generic/packetizer.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 def _encode_header(h_dict, h_signal, obj):
        r = []

diff --git a/misoclib/liteeth/mac/__init__.py b/misoclib/liteeth/mac/__init__.py
index 1517b7bd0d7b9621b4d92d37cd2093d577f21711..622c1842bc1c2a225e6ea8c4baad0632f8b0dfb5 100644 (file)
--- a/misoclib/liteeth/mac/__init__.py
+++ b/misoclib/liteeth/mac/__init__.py
@@ -1,8 +1,8 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.mac.common import *
-from liteeth.mac.core import LiteEthMACCore
-from liteeth.mac.frontend.wishbone import LiteEthMACWishboneInterface
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.mac.common import *
+from misoclib.liteeth.mac.core import LiteEthMACCore
+from misoclib.liteeth.mac.frontend.wishbone import LiteEthMACWishboneInterface
 
 class LiteEthMAC(Module, AutoCSR):
        def __init__(self, phy, dw, interface="crossbar", endianness="big",

diff --git a/misoclib/liteeth/mac/common.py b/misoclib/liteeth/mac/common.py
index 3a68c63212d7fa351a6be2f83beebd7b7427f0d4..cc0e8b20269d9fd6df7ccc667d8b9f7ae371470f 100644 (file)
--- a/misoclib/liteeth/mac/common.py
+++ b/misoclib/liteeth/mac/common.py
@@ -1,8 +1,8 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.generic.depacketizer import LiteEthDepacketizer
-from liteeth.generic.packetizer import LiteEthPacketizer
-from liteeth.generic.crossbar import LiteEthCrossbar
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer
+from misoclib.liteeth.generic.packetizer import LiteEthPacketizer
+from misoclib.liteeth.generic.crossbar import LiteEthCrossbar
 
 class LiteEthMACDepacketizer(LiteEthDepacketizer):
        def __init__(self):

diff --git a/misoclib/liteeth/mac/core/__init__.py b/misoclib/liteeth/mac/core/__init__.py
index 34a21ad10076869e21b3fc466b24d2aacd5e8bd6..d5ca2db0f6eaf15bfce23cae3597d869530bc06a 100644 (file)
--- a/misoclib/liteeth/mac/core/__init__.py
+++ b/misoclib/liteeth/mac/core/__init__.py
@@ -1,6 +1,6 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.mac.core import gap, preamble, crc, padding, last_be
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.mac.core import gap, preamble, crc, padding, last_be
 
 class LiteEthMACCore(Module, AutoCSR):
        def __init__(self, phy, dw, endianness="big", with_hw_preamble_crc=True):

diff --git a/misoclib/liteeth/mac/core/crc.py b/misoclib/liteeth/mac/core/crc.py
index 80321e4cbd42c3f151db31a183b360d8ab1d71b4..84d0c49f4e03d8ac4bd8a734876b93146d26c676 100644 (file)
--- a/misoclib/liteeth/mac/core/crc.py
+++ b/misoclib/liteeth/mac/core/crc.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthMACCRCEngine(Module):
        """Cyclic Redundancy Check Engine

diff --git a/misoclib/liteeth/mac/core/gap.py b/misoclib/liteeth/mac/core/gap.py
index 84f738aac067997a276d31fb16f11977750722f7..a1cfe5a4410b2c0c8b86dc90438be7daea25db47 100644 (file)
--- a/misoclib/liteeth/mac/core/gap.py
+++ b/misoclib/liteeth/mac/core/gap.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthMACGap(Module):
        def __init__(self, dw, ack_on_gap=False):

diff --git a/misoclib/liteeth/mac/core/last_be.py b/misoclib/liteeth/mac/core/last_be.py
index 2b67ad45d24b56b3ad86445beb2b2611f8bfa70a..4ea1d2153806403b0f8593ac4df25d5a5b747afe 100644 (file)
--- a/misoclib/liteeth/mac/core/last_be.py
+++ b/misoclib/liteeth/mac/core/last_be.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthMACTXLastBE(Module):
        def __init__(self, dw):

diff --git a/misoclib/liteeth/mac/core/padding.py b/misoclib/liteeth/mac/core/padding.py
index 12970fe4ee63e166ef1acc622e21eb1c9f92a1a8..8048f90b60adcec32b5baed435b26da036c59981 100644 (file)
--- a/misoclib/liteeth/mac/core/padding.py
+++ b/misoclib/liteeth/mac/core/padding.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthMACPaddingInserter(Module):
        def __init__(self, dw, packet_min_length):

diff --git a/misoclib/liteeth/mac/core/preamble.py b/misoclib/liteeth/mac/core/preamble.py
index fd3cb97528ebdb8f764fc959cf4a18e563a1df4c..283e4d532ea7d4a94695000c2af138b215294b33 100644 (file)
--- a/misoclib/liteeth/mac/core/preamble.py
+++ b/misoclib/liteeth/mac/core/preamble.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthMACPreambleInserter(Module):
        def __init__(self, dw):

diff --git a/misoclib/liteeth/mac/frontend/sram.py b/misoclib/liteeth/mac/frontend/sram.py
index cffe71b405789ed0e1dee2d5ff67e30f392c9b1a..86d7710b62bf5fca0be46257a23c559857c83f1a 100644 (file)
--- a/misoclib/liteeth/mac/frontend/sram.py
+++ b/misoclib/liteeth/mac/frontend/sram.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 from migen.bank.description import *
 from migen.bank.eventmanager import *

diff --git a/misoclib/liteeth/mac/frontend/wishbone.py b/misoclib/liteeth/mac/frontend/wishbone.py
index a68fe382d56c2178ed1d2ab9c05c34a87da97b88..ec35918b36ba8277fa83610929195c30df7d8da3 100644 (file)
--- a/misoclib/liteeth/mac/frontend/wishbone.py
+++ b/misoclib/liteeth/mac/frontend/wishbone.py
@@ -1,6 +1,6 @@
-from liteeth.common import *
-from liteeth.generic import *
-from liteeth.mac.frontend import sram
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
+from misoclib.liteeth.mac.frontend import sram
 
 from migen.bus import wishbone
 from migen.fhdl.simplify import FullMemoryWE

diff --git a/misoclib/liteeth/phy/gmii.py b/misoclib/liteeth/phy/gmii.py
index 180f7da59fc58502a8a888ac2bcb3d65103a0f7e..dc16c2614e3357032dd339947c70dbaae5c6fafd 100644 (file)
--- a/misoclib/liteeth/phy/gmii.py
+++ b/misoclib/liteeth/phy/gmii.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthPHYGMIITX(Module):
        def __init__(self, pads):

diff --git a/misoclib/liteeth/phy/loopback.py b/misoclib/liteeth/phy/loopback.py
index 89ffcb3a06d5bee6ee55d14a8486a9b20944e568..51d4e56b395215e9bb60c5c80477338a09c02468 100644 (file)
--- a/misoclib/liteeth/phy/loopback.py
+++ b/misoclib/liteeth/phy/loopback.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthPHYLoopbackCRG(Module, AutoCSR):
        def __init__(self):

diff --git a/misoclib/liteeth/phy/mii.py b/misoclib/liteeth/phy/mii.py
index 0d3f61be6d52339af5e13ad95adaeeba7e20a0d4..0a5ca6603f5cebfc2b3c7987d9014e64d0985f6b 100644 (file)
--- a/misoclib/liteeth/phy/mii.py
+++ b/misoclib/liteeth/phy/mii.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthPHYMIITX(Module):
        def __init__(self, pads):

diff --git a/misoclib/liteeth/phy/sim.py b/misoclib/liteeth/phy/sim.py
index f7069dd97a3c85fc2997c4458e091bbbe5f20087..a2079a52c5ccf29b3b4d6d68929734b0771c84c3 100644 (file)
--- a/misoclib/liteeth/phy/sim.py
+++ b/misoclib/liteeth/phy/sim.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.generic import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.generic import *
 
 class LiteEthPHYSimCRG(Module, AutoCSR):
        def __init__(self):

diff --git a/misoclib/liteeth/test/arp_tb.py b/misoclib/liteeth/test/arp_tb.py
index 3cd9ad3626bd66ca44545b93fd2b48960b547990..2d2a1ee77db619297b5a860a3d89e4fcbd2e8228 100644 (file)
--- a/misoclib/liteeth/test/arp_tb.py
+++ b/misoclib/liteeth/test/arp_tb.py
@@ -3,12 +3,12 @@ from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.sim.generic import run_simulation
 
-from liteeth.common import *
-from liteeth.mac import LiteEthMAC
-from liteeth.core.arp import LiteEthARP
+from misoclib.liteeth.common import *
+from misoclib.liteeth.mac import LiteEthMAC
+from misoclib.liteeth.core.arp import LiteEthARP
 
-from liteeth.test.common import *
-from liteeth.test.model import phy, mac, arp
+from misoclib.liteeth.test.common import *
+from misoclib.liteeth.test.model import phy, mac, arp
 
 ip_address = 0x12345678
 mac_address = 0x12345678abcd

diff --git a/misoclib/liteeth/test/common.py b/misoclib/liteeth/test/common.py
index d780565bc29327904aba4cd1bbe345d333880877..8b32855bb5fd976ee4e12519f5bab29455f25fd7 100644 (file)
--- a/misoclib/liteeth/test/common.py
+++ b/misoclib/liteeth/test/common.py
@@ -4,7 +4,7 @@ from migen.fhdl.std import *
 from migen.flow.actor import Sink, Source
 from migen.genlib.record import *
 
-from liteeth.common import *
+from misoclib.liteeth.common import *
 
 def print_with_prefix(s, prefix=""):
        if not isinstance(s, str):

diff --git a/misoclib/liteeth/test/etherbone_tb.py b/misoclib/liteeth/test/etherbone_tb.py
index 275dc2e6ab78d03ccd0175fa5841420562e2af23..dbcda1591c31b8657b4825e8697cc9a1275479a4 100644 (file)
--- a/misoclib/liteeth/test/etherbone_tb.py
+++ b/misoclib/liteeth/test/etherbone_tb.py
@@ -3,12 +3,12 @@ from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.sim.generic import run_simulation
 
-from liteeth.common import *
-from liteeth.core import LiteEthUDPIPCore
-from liteeth.core.etherbone import LiteEthEtherbone
+from misoclib.liteeth.common import *
+from misoclib.liteeth.core import LiteEthUDPIPCore
+from misoclib.liteeth.core.etherbone import LiteEthEtherbone
 
-from liteeth.test.common import *
-from liteeth.test.model import phy, mac, arp, ip, udp, etherbone
+from misoclib.liteeth.test.common import *
+from misoclib.liteeth.test.model import phy, mac, arp, ip, udp, etherbone
 
 ip_address = 0x12345678
 mac_address = 0x12345678abcd

diff --git a/misoclib/liteeth/test/icmp_tb.py b/misoclib/liteeth/test/icmp_tb.py
index f5e2d90756f5dd8f0dd89720d68bf1c81f84b582..fd66fe648069c9cacc312a5f0f152afa37027397 100644 (file)
--- a/misoclib/liteeth/test/icmp_tb.py
+++ b/misoclib/liteeth/test/icmp_tb.py
@@ -3,15 +3,15 @@ from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.sim.generic import run_simulation
 
-from liteeth.common import *
-from liteeth.core import LiteEthIPCore
-
-from liteeth.test.common import *
-from liteeth.test.model.dumps import *
-from liteeth.test.model.mac import *
-from liteeth.test.model.ip import *
-from liteeth.test.model.icmp import *
-from liteeth.test.model import phy, mac, arp, ip, icmp
+from misoclib.liteeth.common import *
+from misoclib.liteeth.core import LiteEthIPCore
+
+from misoclib.liteeth.test.common import *
+from misoclib.liteeth.test.model.dumps import *
+from misoclib.liteeth.test.model.mac import *
+from misoclib.liteeth.test.model.ip import *
+from misoclib.liteeth.test.model.icmp import *
+from misoclib.liteeth.test.model import phy, mac, arp, ip, icmp
 
 ip_address = 0x12345678
 mac_address = 0x12345678abcd

diff --git a/misoclib/liteeth/test/ip_tb.py b/misoclib/liteeth/test/ip_tb.py
index 1c21ffa5c1fc92138bd6629b5a2869dbdd6f32b8..434f8857da0250f793144a31bad414256c8e5b8a 100644 (file)
--- a/misoclib/liteeth/test/ip_tb.py
+++ b/misoclib/liteeth/test/ip_tb.py
@@ -3,11 +3,11 @@ from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.sim.generic import run_simulation
 
-from liteeth.common import *
-from liteeth.core import LiteEthIPCore
+from misoclib.liteeth.common import *
+from misoclib.liteeth.core import LiteEthIPCore
 
-from liteeth.test.common import *
-from liteeth.test.model import phy, mac, arp, ip
+from misoclib.liteeth.test.common import *
+from misoclib.liteeth.test.model import phy, mac, arp, ip
 
 ip_address = 0x12345678
 mac_address = 0x12345678abcd

diff --git a/misoclib/liteeth/test/mac_core_tb.py b/misoclib/liteeth/test/mac_core_tb.py
index 341028b7984b706df650c9c106ffe4a60f69c9d1..3f48cf89f0cc6c16aea55385117cbf77c1b22391 100644 (file)
--- a/misoclib/liteeth/test/mac_core_tb.py
+++ b/misoclib/liteeth/test/mac_core_tb.py
@@ -3,11 +3,11 @@ from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.sim.generic import run_simulation
 
-from liteeth.common import *
-from liteeth.mac.core import LiteEthMACCore
+from misoclib.liteeth.common import *
+from misoclib.liteeth.mac.core import LiteEthMACCore
 
-from liteeth.test.common import *
-from liteeth.test.model import phy, mac
+from misoclib.liteeth.test.common import *
+from misoclib.liteeth.test.model import phy, mac
 
 class TB(Module):
        def __init__(self):

diff --git a/misoclib/liteeth/test/mac_wishbone_tb.py b/misoclib/liteeth/test/mac_wishbone_tb.py
index ca6740ebdadd6f1deb13d4a978674ddf6f4c403a..4db3974b6c615007344f26f155de17410a66f2b3 100644 (file)
--- a/misoclib/liteeth/test/mac_wishbone_tb.py
+++ b/misoclib/liteeth/test/mac_wishbone_tb.py
@@ -3,11 +3,11 @@ from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.sim.generic import run_simulation
 
-from liteeth.common import *
-from liteeth.mac import LiteEthMAC
+from misoclib.liteeth.common import *
+from misoclib.liteeth.mac import LiteEthMAC
 
-from liteeth.test.common import *
-from liteeth.test.model import phy, mac
+from misoclib.liteeth.test.common import *
+from misoclib.liteeth.test.model import phy, mac
 
 class WishboneMaster:
        def __init__(self, obj):

diff --git a/misoclib/liteeth/test/model/arp.py b/misoclib/liteeth/test/model/arp.py
index 677904cc74dce0c0fe730bc05649e552786c4f98..e6f3bfe68d7efcff21ae5117d5c680078853a8a1 100644 (file)
--- a/misoclib/liteeth/test/model/arp.py
+++ b/misoclib/liteeth/test/model/arp.py
@@ -1,9 +1,9 @@
 import math
 
-from liteeth.common import *
-from liteeth.test.common import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.test.common import *
 
-from liteeth.test.model import mac
+from misoclib.liteeth.test.model import mac
 
 def print_arp(s):
        print_with_prefix(s, "[ARP]")
@@ -118,8 +118,8 @@ class ARP(Module):
                request.target_ip = ip_address
 
 if __name__ == "__main__":
-       from liteeth.test.model.dumps import *
-       from liteeth.test.model.mac import *
+       from misoclib.liteeth.test.model.dumps import *
+       from misoclib.liteeth.test.model.mac import *
        errors = 0
        # ARP request
        packet = MACPacket(arp_request)

diff --git a/misoclib/liteeth/test/model/etherbone.py b/misoclib/liteeth/test/model/etherbone.py
index 96cf49f757be75281d3600092675542d74290c57..96606e31538b56fb5480b3d37989ca012cdf6e04 100644 (file)
--- a/misoclib/liteeth/test/model/etherbone.py
+++ b/misoclib/liteeth/test/model/etherbone.py
@@ -1,9 +1,9 @@
 import math, copy
 
-from liteeth.common import *
-from liteeth.test.common import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.test.common import *
 
-from liteeth.test.model import udp
+from misoclib.liteeth.test.model import udp
 
 def print_etherbone(s):
        print_with_prefix(s, "[ETHERBONE]")

diff --git a/misoclib/liteeth/test/model/icmp.py b/misoclib/liteeth/test/model/icmp.py
index cf54b17c34f71867961fe2c0bf1f10c7dde2c1fa..2d4ff2456aa97dc9f6f9af8b8c9e1f712a1332b9 100644 (file)
--- a/misoclib/liteeth/test/model/icmp.py
+++ b/misoclib/liteeth/test/model/icmp.py
@@ -1,9 +1,9 @@
 import math
 
-from liteeth.common import *
-from liteeth.test.common import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.test.common import *
 
-from liteeth.test.model import ip
+from misoclib.liteeth.test.model import ip
 
 def print_icmp(s):
        print_with_prefix(s, "[ICMP]")
@@ -79,9 +79,9 @@ class ICMP(Module):
                pass
 
 if __name__ == "__main__":
-       from liteeth.test.model.dumps import *
-       from liteeth.test.model.mac import *
-       from liteeth.test.model.ip import *
+       from misoclib.liteeth.test.model.dumps import *
+       from misoclib.liteeth.test.model.mac import *
+       from misoclib.liteeth.test.model.ip import *
        errors = 0
        # ICMP packet
        packet = MACPacket(ping_request)

diff --git a/misoclib/liteeth/test/model/ip.py b/misoclib/liteeth/test/model/ip.py
index 03c5f8b5863281987f256be33cd76512a0c8949d..97ec33d0562755e7f260d3efc79505ee51a8bb0b 100644 (file)
--- a/misoclib/liteeth/test/model/ip.py
+++ b/misoclib/liteeth/test/model/ip.py
@@ -1,9 +1,9 @@
 import math
 
-from liteeth.common import *
-from liteeth.test.common import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.test.common import *
 
-from liteeth.test.model import mac
+from misoclib.liteeth.test.model import mac
 
 def print_ip(s):
        print_with_prefix(s, "[IP]")
@@ -124,8 +124,8 @@ class IP(Module):
                                self.icmp_callback(packet)
 
 if __name__ == "__main__":
-       from liteeth.test.model.dumps import *
-       from liteeth.test.model.mac import *
+       from misoclib.liteeth.test.model.dumps import *
+       from misoclib.liteeth.test.model.mac import *
        errors = 0
        # UDP packet
        packet = MACPacket(udp)

diff --git a/misoclib/liteeth/test/model/mac.py b/misoclib/liteeth/test/model/mac.py
index 9267f88bb62b8bfb10e1412043eb38d4a5a42bc5..c4d6c9054248740d645d617434bf3a5a70ae4e6c 100644 (file)
--- a/misoclib/liteeth/test/model/mac.py
+++ b/misoclib/liteeth/test/model/mac.py
@@ -1,7 +1,7 @@
 import math, binascii
 
-from liteeth.common import *
-from liteeth.test.common import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.test.common import *
 
 def print_mac(s):
        print_with_prefix(s, "[MAC]")
@@ -127,7 +127,7 @@ class MAC(Module):
                                raise ValueError # XXX handle this properly
 
 if __name__ == "__main__":
-       from liteeth.test.model.dumps import *
+       from misoclib.liteeth.test.model.dumps import *
        errors = 0
        packet = MACPacket(arp_request)
        packet.decode_remove_header()

diff --git a/misoclib/liteeth/test/model/phy.py b/misoclib/liteeth/test/model/phy.py
index 1401110feb14b88e4ac860b73373aa9f7eeb9599..14fd2e38304f629b37c1cd10ff77d151f7a586d0 100644 (file)
--- a/misoclib/liteeth/test/model/phy.py
+++ b/misoclib/liteeth/test/model/phy.py
@@ -1,5 +1,5 @@
-from liteeth.common import *
-from liteeth.test.common import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.test.common import *
 
 def print_phy(s):
        print_with_prefix(s, "[PHY]")

diff --git a/misoclib/liteeth/test/model/udp.py b/misoclib/liteeth/test/model/udp.py
index 20e0e6f2a279ce380f5a19002a05b2235ca58572..32f1077bbcfa09893f456f85b9fbac21d93b0353 100644 (file)
--- a/misoclib/liteeth/test/model/udp.py
+++ b/misoclib/liteeth/test/model/udp.py
@@ -1,9 +1,9 @@
 import math
 
-from liteeth.common import *
-from liteeth.test.common import *
+from misoclib.liteeth.common import *
+from misoclib.liteeth.test.common import *
 
-from liteeth.test.model import ip
+from misoclib.liteeth.test.model import ip
 
 def print_udp(s):
        print_with_prefix(s, "[UDP]")
@@ -90,9 +90,9 @@ class UDP(Module):
                                self.etherbone_callback(packet)
 
 if __name__ == "__main__":
-       from liteeth.test.model.dumps import *
-       from liteeth.test.model.mac import *
-       from liteeth.test.model.ip import *
+       from misoclib.liteeth.test.model.dumps import *
+       from misoclib.liteeth.test.model.mac import *
+       from misoclib.liteeth.test.model.ip import *
        errors = 0
        # UDP packet
        packet = MACPacket(udp)

diff --git a/misoclib/liteeth/test/udp_tb.py b/misoclib/liteeth/test/udp_tb.py
index 74811dc7b9a16d00d95b8573a1ad09b1f2997c40..2f7ef9dd31d1f497ac6d5838671a36eea578368c 100644 (file)
--- a/misoclib/liteeth/test/udp_tb.py
+++ b/misoclib/liteeth/test/udp_tb.py
@@ -3,11 +3,11 @@ from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.sim.generic import run_simulation
 
-from liteeth.common import *
-from liteeth.core import LiteEthUDPIPCore
+from misoclib.liteeth.common import *
+from misoclib.liteeth.core import LiteEthUDPIPCore
 
-from liteeth.test.common import *
-from liteeth.test.model import phy, mac, arp, ip, udp
+from misoclib.liteeth.test.common import *
+from misoclib.liteeth.test.model import phy, mac, arp, ip, udp
 
 ip_address = 0x12345678
 mac_address = 0x12345678abcd

diff --git a/targets/kc705.py b/targets/kc705.py
index 50b6880416b157b834af1765767cff147d8c8677..4af947fc3042c7347e4831d06d82c12278980238 100644 (file)
--- a/targets/kc705.py
+++ b/targets/kc705.py
@@ -5,9 +5,8 @@ from misoclib import sdram, spiflash
 from misoclib.sdram.phy import k7ddrphy
 from misoclib.gensoc import SDRAMSoC
 
-from extcores import *
-from liteeth.phy.gmii import LiteEthPHYGMII
-from liteeth.mac import LiteEthMAC
+from misoclib.liteeth.phy.gmii import LiteEthPHYGMII
+from misoclib.liteeth.mac import LiteEthMAC
 
 class _CRG(Module):
        def __init__(self, platform):

diff --git a/targets/mlabs_video.py b/targets/mlabs_video.py
index 0738cd1ab615a5693de14c89bf6743e918e3ea3d..c88e15c464cb39c54ec34a670f52ae6891caf256 100644 (file)
--- a/targets/mlabs_video.py
+++ b/targets/mlabs_video.py
@@ -8,9 +8,8 @@ from misoclib import sdram, mxcrg, norflash16, framebuffer, gpio
 from misoclib.sdram.phy import s6ddrphy
 from misoclib.gensoc import SDRAMSoC
 
-from extcores import *
-from liteeth.phy.mii import LiteEthPHYMII
-from liteeth.mac import LiteEthMAC
+from misoclib.liteeth.phy.mii import LiteEthPHYMII
+from misoclib.liteeth.mac import LiteEthMAC
 
 class _MXClockPads:
        def __init__(self, platform):