From 0af017e67c573773a14c308818a7cd9f9b69572b Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Mon, 24 Jun 2019 11:44:41 +0200 Subject: [PATCH] liteeth: update mac imports (olds still works, but that's now the prefered way) --- litex/boards/targets/ac701.py | 2 +- litex/boards/targets/arty.py | 2 +- litex/boards/targets/genesys2.py | 2 +- litex/boards/targets/kc705.py | 2 +- litex/boards/targets/kcu105.py | 2 +- litex/boards/targets/netv2.py | 2 +- litex/boards/targets/nexys4ddr.py | 2 +- litex/boards/targets/nexys_video.py | 2 +- litex/boards/targets/simple.py | 2 +- litex/boards/targets/versa_ecp5.py | 2 +- litex/tools/litex_sim.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/litex/boards/targets/ac701.py b/litex/boards/targets/ac701.py index eed0a45c..425e6f3a 100755 --- a/litex/boards/targets/ac701.py +++ b/litex/boards/targets/ac701.py @@ -21,7 +21,7 @@ from litedram.phy import s7ddrphy from liteeth.phy.a7_gtp import QPLLSettings, QPLL from liteeth.phy.a7_1000basex import A7_1000BASEX from liteeth.phy.s7rgmii import LiteEthPHYRGMII -from liteeth.core.mac import LiteEthMAC +from liteeth.mac import LiteEthMAC # CRG ---------------------------------------------------------------------------------------------- diff --git a/litex/boards/targets/arty.py b/litex/boards/targets/arty.py index ecec01b1..7b36a493 100755 --- a/litex/boards/targets/arty.py +++ b/litex/boards/targets/arty.py @@ -18,7 +18,7 @@ from litedram.modules import MT41K128M16 from litedram.phy import s7ddrphy from liteeth.phy.mii import LiteEthPHYMII -from liteeth.core.mac import LiteEthMAC +from liteeth.mac import LiteEthMAC # CRG ---------------------------------------------------------------------------------------------- diff --git a/litex/boards/targets/genesys2.py b/litex/boards/targets/genesys2.py index f6b10da0..ac426075 100755 --- a/litex/boards/targets/genesys2.py +++ b/litex/boards/targets/genesys2.py @@ -18,7 +18,7 @@ from litedram.modules import MT41J256M16 from litedram.phy import s7ddrphy from liteeth.phy.s7rgmii import LiteEthPHYRGMII -from liteeth.core.mac import LiteEthMAC +from liteeth.mac import LiteEthMAC # CRG ---------------------------------------------------------------------------------------------- diff --git a/litex/boards/targets/kc705.py b/litex/boards/targets/kc705.py index 2c59c5c9..0a6205c3 100755 --- a/litex/boards/targets/kc705.py +++ b/litex/boards/targets/kc705.py @@ -20,7 +20,7 @@ from litedram.modules import MT8JTF12864 from litedram.phy import s7ddrphy from liteeth.phy import LiteEthPHY -from liteeth.core.mac import LiteEthMAC +from liteeth.mac import LiteEthMAC # CRG ---------------------------------------------------------------------------------------------- diff --git a/litex/boards/targets/kcu105.py b/litex/boards/targets/kcu105.py index 1f73d594..e6106aab 100755 --- a/litex/boards/targets/kcu105.py +++ b/litex/boards/targets/kcu105.py @@ -18,7 +18,7 @@ from litedram.modules import EDY4016A from litedram.phy import usddrphy from liteeth.phy.ku_1000basex import KU_1000BASEX -from liteeth.core.mac import LiteEthMAC +from liteeth.mac import LiteEthMAC # CRG ---------------------------------------------------------------------------------------------- diff --git a/litex/boards/targets/netv2.py b/litex/boards/targets/netv2.py index e8a50a2d..2f98e0bc 100755 --- a/litex/boards/targets/netv2.py +++ b/litex/boards/targets/netv2.py @@ -18,7 +18,7 @@ from litedram.modules import MT41J128M16 from litedram.phy import s7ddrphy from liteeth.phy.rmii import LiteEthPHYRMII -from liteeth.core.mac import LiteEthMAC +from liteeth.mac import LiteEthMAC # CRG ---------------------------------------------------------------------------------------------- diff --git a/litex/boards/targets/nexys4ddr.py b/litex/boards/targets/nexys4ddr.py index e46f4314..d1c451ff 100755 --- a/litex/boards/targets/nexys4ddr.py +++ b/litex/boards/targets/nexys4ddr.py @@ -18,7 +18,7 @@ from litedram.modules import MT47H64M16 from litedram.phy import s7ddrphy from liteeth.phy.rmii import LiteEthPHYRMII -from liteeth.core.mac import LiteEthMAC +from liteeth.mac import LiteEthMAC # CRG ---------------------------------------------------------------------------------------------- diff --git a/litex/boards/targets/nexys_video.py b/litex/boards/targets/nexys_video.py index 3d58a42a..39b23526 100755 --- a/litex/boards/targets/nexys_video.py +++ b/litex/boards/targets/nexys_video.py @@ -18,7 +18,7 @@ from litedram.modules import MT41K256M16 from litedram.phy import s7ddrphy from liteeth.phy.s7rgmii import LiteEthPHYRGMII -from liteeth.core.mac import LiteEthMAC +from liteeth.mac import LiteEthMAC # CRG ---------------------------------------------------------------------------------------------- diff --git a/litex/boards/targets/simple.py b/litex/boards/targets/simple.py index 40677207..f0af059e 100755 --- a/litex/boards/targets/simple.py +++ b/litex/boards/targets/simple.py @@ -14,7 +14,7 @@ from litex.soc.integration.soc_core import * from litex.soc.integration.builder import * from liteeth.phy import LiteEthPHY -from liteeth.core.mac import LiteEthMAC +from liteeth.mac import LiteEthMAC # BaseSoC ------------------------------------------------------------------------------------------ diff --git a/litex/boards/targets/versa_ecp5.py b/litex/boards/targets/versa_ecp5.py index 8f1a9719..b0a15ff3 100755 --- a/litex/boards/targets/versa_ecp5.py +++ b/litex/boards/targets/versa_ecp5.py @@ -20,7 +20,7 @@ from litedram.modules import MT41K64M16 from litedram.phy import ECP5DDRPHY from liteeth.phy.ecp5rgmii import LiteEthPHYRGMII -from liteeth.core.mac import LiteEthMAC +from liteeth.mac import LiteEthMAC # CRG ---------------------------------------------------------------------------------------------- diff --git a/litex/tools/litex_sim.py b/litex/tools/litex_sim.py index afd35929..b255d917 100755 --- a/litex/tools/litex_sim.py +++ b/litex/tools/litex_sim.py @@ -25,7 +25,7 @@ from litedram.phy.model import SDRAMPHYModel from liteeth.common import convert_ip from liteeth.phy.model import LiteEthPHYModel -from liteeth.core.mac import LiteEthMAC +from liteeth.mac import LiteEthMAC from liteeth.core import LiteEthUDPIPCore from liteeth.frontend.etherbone import LiteEthEtherbone -- 2.30.2