From efa41fd6bbe8f3171d7dd5c2213e59be576d7a42 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Sat, 20 Jun 2020 09:15:56 +0200 Subject: [PATCH] litex_sim: simplify a bit ethernet+etherbone. --- litex/tools/litex_sim.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/litex/tools/litex_sim.py b/litex/tools/litex_sim.py index c1d98663..bd8c5367 100755 --- a/litex/tools/litex_sim.py +++ b/litex/tools/litex_sim.py @@ -226,13 +226,12 @@ class SimSoC(SoCCore): #assert not (with_ethernet and with_etherbone) if with_ethernet and with_etherbone: - dw = 8 etherbone_ip_address = convert_ip(etherbone_ip_address) # Ethernet PHY self.submodules.ethphy = LiteEthPHYModel(self.platform.request("eth", 0)) self.add_csr("ethphy") # Ethernet MAC - self.submodules.ethmac = LiteEthMAC(phy=self.ethphy, dw=dw, + self.submodules.ethmac = LiteEthMAC(phy=self.ethphy, dw=8, interface = "hybrid", endianness = self.cpu.endianness, hw_mac = etherbone_mac_address) @@ -243,10 +242,10 @@ class SimSoC(SoCCore): self.add_csr("ethmac") self.add_interrupt("ethmac") # HW ethernet - self.submodules.arp = LiteEthARP(self.ethmac, etherbone_mac_address, etherbone_ip_address, sys_clk_freq, dw=dw) - self.submodules.ip = LiteEthIP(self.ethmac, etherbone_mac_address, etherbone_ip_address, self.arp.table, dw=dw) - self.submodules.icmp = LiteEthICMP(self.ip, etherbone_ip_address, dw=dw) - self.submodules.udp = LiteEthUDP(self.ip, etherbone_ip_address, dw=dw) + self.submodules.arp = LiteEthARP(self.ethmac, etherbone_mac_address, etherbone_ip_address, sys_clk_freq, dw=8) + self.submodules.ip = LiteEthIP(self.ethmac, etherbone_mac_address, etherbone_ip_address, self.arp.table, dw=8) + self.submodules.icmp = LiteEthICMP(self.ip, etherbone_ip_address, dw=8) + self.submodules.udp = LiteEthUDP(self.ip, etherbone_ip_address, dw=8) # Etherbone self.submodules.etherbone = LiteEthEtherbone(self.udp, 1234, mode="master") self.add_wb_master(self.etherbone.wishbone.bus) -- 2.30.2