Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hybrid Etherbone simplification #1838

Merged
merged 2 commits into from
Nov 13, 2023

Conversation

AndrewD
Copy link
Collaborator

@AndrewD AndrewD commented Nov 13, 2023

Tighter integration of Ethernet with etherbone. litex_sim updated to use this interface, siglent_sds1104xe will need this update:

index dbf8fa4..b473d0e 100755
--- a/litex_boards/targets/siglent_sds1104xe.py
+++ b/litex_boards/targets/siglent_sds1104xe.py
@@ -111,20 +111,7 @@ class BaseSoC(SoCCore):
                 ip_address  = "192.168.1.51",
                 mac_address = 0x10e2d5000001,
                 data_width  = 8,
-                interface   = "hybrid",
-                endianness  = self.cpu.endianness
-            )
-
-            # 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)
-
-            self.add_constant("ETH_PHY_NO_RESET") # Disable reset from BIOS to avoid disabling Hardware Interface.
+                ethernet    = True)
 
         # Video ------------------------------------------------------------------------------------
         video_timings = ("800x480@60Hz", {

@enjoy-digital enjoy-digital merged commit 2d9a268 into enjoy-digital:master Nov 13, 2023
1 check passed
@enjoy-digital
Copy link
Owner

Thanks @AndrewD! That's merged.

@AndrewD AndrewD deleted the etherbone branch November 14, 2023 00:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants