liteeth: finish with_preamble_crc vs with_hw_preamble_crc renaming

diff --git a/misoclib/com/liteeth/core/__init__.py b/misoclib/com/liteeth/core/__init__.py
index 10bd2f9078a1578c6f81db480611a4fc010d6296..834513165cb04398ce49cefb15f4db93fdb613d5 100644 (file)
--- a/misoclib/com/liteeth/core/__init__.py
+++ b/misoclib/com/liteeth/core/__init__.py
@@ -9,7 +9,7 @@ from misoclib.com.liteeth.core.icmp import LiteEthICMP
 
 class LiteEthIPCore(Module, AutoCSR):
     def __init__(self, phy, mac_address, ip_address, clk_freq):
-        self.submodules.mac = LiteEthMAC(phy, 8, interface="crossbar", with_hw_preamble_crc=True)
+        self.submodules.mac = LiteEthMAC(phy, 8, interface="crossbar", with_preamble_crc=True)
         self.submodules.arp = LiteEthARP(self.mac, mac_address, ip_address, clk_freq)
         self.submodules.ip = LiteEthIP(self.mac, mac_address, ip_address, self.arp.table)
         self.submodules.icmp = LiteEthICMP(self.ip, ip_address)

diff --git a/misoclib/com/liteeth/mac/__init__.py b/misoclib/com/liteeth/mac/__init__.py
index 7611f192e4606f1d5389ea94dd478ce13cd24b25..f951c38b3179b710d8ad5167a388e8a1f0dac6e9 100644 (file)
--- a/misoclib/com/liteeth/mac/__init__.py
+++ b/misoclib/com/liteeth/mac/__init__.py
@@ -7,8 +7,8 @@ from misoclib.com.liteeth.mac.frontend.wishbone import LiteEthMACWishboneInterfa
 
 class LiteEthMAC(Module, AutoCSR):
     def __init__(self, phy, dw, interface="crossbar", endianness="big",
-            with_hw_preamble_crc=True):
-        self.submodules.core = LiteEthMACCore(phy, dw, endianness, with_hw_preamble_crc)
+            with_preamble_crc=True):
+        self.submodules.core = LiteEthMACCore(phy, dw, endianness, with_preamble_crc)
         self.csrs = []
         if interface == "crossbar":
             self.submodules.crossbar = LiteEthMACCrossbar()

diff --git a/misoclib/com/liteeth/test/arp_tb.py b/misoclib/com/liteeth/test/arp_tb.py
index f7b76855088aff132227024f7ab2665290d62e37..f4b1fee48b50b489bd09d5fb8ea6a9aefbf13325 100644 (file)
--- a/misoclib/com/liteeth/test/arp_tb.py
+++ b/misoclib/com/liteeth/test/arp_tb.py
@@ -20,7 +20,7 @@ class TB(Module):
         self.submodules.mac_model = mac.MAC(self.phy_model, debug=False, loopback=False)
         self.submodules.arp_model = arp.ARP(self.mac_model, mac_address, ip_address, debug=False)
 
-        self.submodules.mac = LiteEthMAC(self.phy_model, dw=8, with_hw_preamble_crc=True)
+        self.submodules.mac = LiteEthMAC(self.phy_model, dw=8, with_preamble_crc=True)
         self.submodules.arp = LiteEthARP(self.mac, mac_address, ip_address, 100000)
 
         # use sys_clk for each clock_domain

diff --git a/misoclib/com/liteeth/test/mac_core_tb.py b/misoclib/com/liteeth/test/mac_core_tb.py
index d836fe669d7572e1caf192f555d1518c415f112e..c852417d3b88e2ee064dc1feaa8c25afdfcc39f2 100644 (file)
--- a/misoclib/com/liteeth/test/mac_core_tb.py
+++ b/misoclib/com/liteeth/test/mac_core_tb.py
@@ -14,7 +14,7 @@ class TB(Module):
     def __init__(self):
         self.submodules.phy_model = phy.PHY(8, debug=False)
         self.submodules.mac_model = mac.MAC(self.phy_model, debug=False, loopback=True)
-        self.submodules.core = LiteEthMACCore(phy=self.phy_model, dw=8, with_hw_preamble_crc=True)
+        self.submodules.core = LiteEthMACCore(phy=self.phy_model, dw=8, with_preamble_crc=True)
 
         self.submodules.streamer = PacketStreamer(eth_phy_description(8), last_be=1)
         self.submodules.streamer_randomizer = AckRandomizer(eth_phy_description(8), level=50)

diff --git a/misoclib/com/liteeth/test/mac_wishbone_tb.py b/misoclib/com/liteeth/test/mac_wishbone_tb.py
index 424e3ba4cf7b075ec3213ac22a19058e897cf987..cfc1efdc7aecf62a9ab11ed448b36db9ec1fc39c 100644 (file)
--- a/misoclib/com/liteeth/test/mac_wishbone_tb.py
+++ b/misoclib/com/liteeth/test/mac_wishbone_tb.py
@@ -85,7 +85,7 @@ class TB(Module):
     def __init__(self):
         self.submodules.phy_model = phy.PHY(8, debug=False)
         self.submodules.mac_model = mac.MAC(self.phy_model, debug=False, loopback=True)
-        self.submodules.ethmac = LiteEthMAC(phy=self.phy_model, dw=32, interface="wishbone", with_hw_preamble_crc=True)
+        self.submodules.ethmac = LiteEthMAC(phy=self.phy_model, dw=32, interface="wishbone", with_preamble_crc=True)
 
         # use sys_clk for each clock_domain
         self.clock_domains.cd_eth_rx = ClockDomain()

diff --git a/targets/simple.py b/targets/simple.py
index 095ab910a85ae6f2185ba94e78873e0f3febf949..62ea87ce35ace6b8c236490ddef90a19dd0d4401 100644 (file)
--- a/targets/simple.py
+++ b/targets/simple.py
@@ -41,7 +41,7 @@ class MiniSoC(BaseSoC):
                                             platform.request("eth"))
         self.submodules.ethmac = LiteEthMAC(phy=self.ethphy, dw=32,
                                             interface="wishbone",
-                                            with_hw_preamble_crc=False)
+                                            with_preamble_crc=False)
         self.add_wb_slave(mem_decoder(self.mem_map["ethmac"]), self.ethmac.bus)
         self.add_memory_region("ethmac", self.mem_map["ethmac"]+self.shadow_address, 0x2000)