change MAC location (next to phy/core/frontend), keep import retro-compatibility

This commit is contained in:
Florent Kermarrec 2019-06-24 11:20:36 +02:00
parent 789dadd8bf
commit a170acda0f
12 changed files with 7 additions and 7 deletions

View File

@ -1,11 +1,10 @@
from liteeth.common import *
from liteeth.core.mac import LiteEthMAC
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
class LiteEthIPCore(Module, AutoCSR):
def __init__(self, phy, mac_address, ip_address, clk_freq, with_icmp=True):
self.submodules.mac = LiteEthMAC(phy, 8, interface="crossbar", with_preamble_crc=True)

1
liteeth/core/mac.py Normal file
View File

@ -0,0 +1 @@
from liteeth.mac import * # retro-compatibility # FIXME: remove

View File

@ -1,7 +1,7 @@
from liteeth.common import *
from liteeth.core.mac.common import *
from liteeth.core.mac.core import LiteEthMACCore
from liteeth.core.mac.wishbone import LiteEthMACWishboneInterface
from liteeth.mac.common import *
from liteeth.mac.core import LiteEthMACCore
from liteeth.mac.wishbone import LiteEthMACWishboneInterface
class LiteEthMAC(Module, AutoCSR):

View File

@ -1,5 +1,5 @@
from liteeth.common import *
from liteeth.core.mac import gap, preamble, crc, padding, last_be
from liteeth.mac import gap, preamble, crc, padding, last_be
from liteeth.phy.model import LiteEthPHYModel
from migen.genlib.cdc import PulseSynchronizer

View File

@ -1,7 +1,7 @@
from migen.fhdl.simplify import FullMemoryWE
from liteeth.common import *
from liteeth.core.mac import sram
from liteeth.mac import sram
from litex.soc.interconnect import wishbone