Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

litex_sim: simplify a bit ethernet+etherbone.

This commit is contained in:
Florent Kermarrec 2020-06-20 09:15:56 +02:00
parent b0b37b4cb9
commit efa41fd6bb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
litex/tools/litex_sim.py
View File

@ -226,13 +226,12 @@ class SimSoC(SoCCore):
#assert not (with_ethernet and with_etherbone) #assert not (with_ethernet and with_etherbone)
if with_ethernet and with_etherbone: if with_ethernet and with_etherbone:
dw = 8
etherbone_ip_address = convert_ip(etherbone_ip_address) etherbone_ip_address = convert_ip(etherbone_ip_address)
# Ethernet PHY # Ethernet PHY
self.submodules.ethphy = LiteEthPHYModel(self.platform.request("eth", 0)) self.submodules.ethphy = LiteEthPHYModel(self.platform.request("eth", 0))
self.add_csr("ethphy") self.add_csr("ethphy")
# Ethernet MAC # Ethernet MAC
self.submodules.ethmac = LiteEthMAC(phy=self.ethphy, dw=dw, self.submodules.ethmac = LiteEthMAC(phy=self.ethphy, dw=8,
interface = "hybrid", interface = "hybrid",
endianness = self.cpu.endianness, endianness = self.cpu.endianness,
hw_mac = etherbone_mac_address) hw_mac = etherbone_mac_address)
@ -243,10 +242,10 @@ class SimSoC(SoCCore):
self.add_csr("ethmac") self.add_csr("ethmac")
self.add_interrupt("ethmac") self.add_interrupt("ethmac")
# HW ethernet # HW ethernet
self.submodules.arp = LiteEthARP(self.ethmac, etherbone_mac_address, etherbone_ip_address, sys_clk_freq, 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=dw) 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=dw) self.submodules.icmp = LiteEthICMP(self.ip, etherbone_ip_address, dw=8)
self.submodules.udp = LiteEthUDP(self.ip, etherbone_ip_address, dw=dw) self.submodules.udp = LiteEthUDP(self.ip, etherbone_ip_address, dw=8)
# Etherbone # Etherbone
self.submodules.etherbone = LiteEthEtherbone(self.udp, 1234, mode="master") self.submodules.etherbone = LiteEthEtherbone(self.udp, 1234, mode="master")
self.add_wb_master(self.etherbone.wishbone.bus) self.add_wb_master(self.etherbone.wishbone.bus)