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

tools/litex_sim: update hybrid etherbone integration

This commit is contained in:
Andrew Dennison 2023-11-13 11:13:19 +11:00
parent fb5512f6d5
commit 885d5b9cb1
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
litex/tools/litex_sim.py
View File

@ -233,29 +233,16 @@ class SimSoC(SoCCore):
else: else:
raise ValueError("Unknown Ethernet PHY model:", ethernet_phy_model) raise ValueError("Unknown Ethernet PHY model:", ethernet_phy_model)
# Ethernet and Etherbone ------------------------------------------------------------------- # Etherbone with optional Ethernet ---------------------------------------------------------
if with_ethernet and with_etherbone: if with_etherbone:
# Etherbone.
self.add_etherbone( self.add_etherbone(
phy = self.ethphy, phy = self.ethphy,
ip_address = etherbone_ip_address, ip_address = etherbone_ip_address,
mac_address = etherbone_mac_address, mac_address = etherbone_mac_address,
data_width = 8, data_width = 8,
interface = "hybrid", ethernet = with_ethernet,
endianness = self.cpu.endianness
) )
# Ethernet only ----------------------------------------------------------------------------
# Software Interface.
self.ethmac = ethmac = self.get_module("ethcore_etherbone").mac
ethmac_region_size = (ethmac.rx_slots.constant + ethmac.tx_slots.constant)*ethmac.slot_size.constant
ethmac_region = SoCRegion(origin=self.mem_map.get("ethmac", None), size=ethmac_region_size, cached=False)
self.bus.add_slave(name="ethmac", slave=ethmac.bus, region=ethmac_region)
# Add IRQs (if enabled).
if self.irq.enabled:
self.irq.add("ethmac", use_loc_if_exists=True)
# Ethernet ---------------------------------------------------------------------------------
elif with_ethernet: elif with_ethernet:
# Ethernet MAC # Ethernet MAC
self.ethmac = ethmac = LiteEthMAC( self.ethmac = ethmac = LiteEthMAC(
@ -272,14 +259,6 @@ class SimSoC(SoCCore):
if self.irq.enabled: if self.irq.enabled:
self.irq.add("ethmac", use_loc_if_exists=True) self.irq.add("ethmac", use_loc_if_exists=True)
# Etherbone --------------------------------------------------------------------------------
elif with_etherbone:
self.add_etherbone(
phy = self.ethphy,
ip_address = etherbone_ip_address,
mac_address = etherbone_mac_address
)
# I2C -------------------------------------------------------------------------------------- # I2C --------------------------------------------------------------------------------------
if with_i2c: if with_i2c:
pads = platform.request("i2c", 0) pads = platform.request("i2c", 0)