liteeth: update mac imports (olds still works, but that's now the prefered way)

diff --git a/litex/boards/targets/ac701.py b/litex/boards/targets/ac701.py
index eed0a45c3663a250c33139b00223ead46fb73b85..425e6f3adf7771893a2d24154e79e32ca8fa01c0 100755 (executable)
--- 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 ecec01b16f73c0f86742bf58da968c0142156b21..7b36a493a0bacd232793452ce5028752656f95fa 100755 (executable)
--- 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 f6b10da00675e0998c55ece15d394975d632b652..ac42607550f8b670bdb258e0171be25e0d735195 100755 (executable)
--- 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 2c59c5c992b363dd88b6fc7692bd34115f41c82a..0a6205c3136f432ab7167098873850d3800fd9d8 100755 (executable)
--- 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 1f73d59413f41112fa362398becec63409961489..e6106aabd2d8062bda6960022eadbaf30393f82f 100755 (executable)
--- 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 e8a50a2dd74695998b736e5e59879ac58e3498f1..2f98e0bcbbea698868b1438d491dee7c59f2949e 100755 (executable)
--- 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 e46f43145f7d1ba1f8e2de1f3e1c229522b6ec73..d1c451ffc13ca8efc6cbe514b5cef9097be8691a 100755 (executable)
--- 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 3d58a42a40e640ee6e85eb1f2eab942fd771f831..39b235261d19b76f8497dce0c48d3f31e7406530 100755 (executable)
--- 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 40677207d000a65734f477d2f8c03147a320f745..f0af059e05ec7aedcf4f80a74d4eaef5e014c0a4 100755 (executable)
--- 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 8f1a97199a29ea219f63c74102ea7a5ea8caeeb0..b0a15ff38aaffb1fd0a2d81894dba4a06fcea889 100755 (executable)
--- 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 afd359290d4c2bdfb47fc3716698d5e471682441..b255d9173f449027d46fdf868bc213180eec10b8 100755 (executable)
--- 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