firmware/Cargo.toml

@@ -1,6 +0,0 @@
-[package]
-name = "firmware"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]

firmware/src/main.rs

@@ -1,3 +0,0 @@
-fn main() {
-    println!("Hello, world!");
-}

gen_liteeth.py

@@ -27,7 +27,7 @@ from liteeth.common import *
 
 from liteeth import phy as liteeth_phys
 from liteeth.mac import LiteEthMAC
-from liteeth_cores import LiteEthUDPIPCore
+from liteeth.core import LiteEthUDPIPCore
 from liteeth.core.udp import LiteEthUDP
 
 # IOs ----------------------------------------------------------------------------------------------
@@ -43,9 +43,6 @@ _io = [
     # IP/MAC Address.
     ("ip_address",  0, Pins(32)),
 
-    # Interrupt
-    ("interrupt", 0, Pins(1)),
-
     # MII PHY Pads
     ("mii_eth_clocks", 0,
         Subsignal("tx", Pins(1)),
@@ -183,26 +180,40 @@ class UDPCore(PHYCore):
             clk_freq=CLK_FREQ,
             dw=8,
             with_sys_datapath=False,
-            hybrid=True,
         )
 
-        # CPU port
+        # DHCP port
-        nrxslots = self.core.mac.rx_slots.constant
+        data_width = 32
-        ntxslots = self.core.mac.tx_slots.constant
 
-        wb_bus = wishbone.Interface()
+        platform.add_extension(get_udp_streamer_port_ios(
-        platform.add_extension(wb_bus.get_ios("wishbone"))
+            "dhcp",
-        self.comb += wb_bus.connect_to_pads(self.platform.request("wishbone"), mode="slave")
+            data_width=data_width,
-        self.add_wb_master(wb_bus)
+        ))
+        dhcp_ios = platform.request("dhcp")
 
-        ethmac_region_size = (nrxslots + ntxslots)*buffer_depth
+        dhcp_streamer = LiteEthUDPStreamer(
-        ethmac_region = SoCRegion(
+            self.core.udp,
-            origin=self.mem_map.get("ethmac", None),
+            ip_address=dhcp_ios.ip_address,
-            size=ethmac_region_size,
+            udp_port=67,
-            cached=False
+            data_width=data_width,
+            tx_fifo_depth=64,
+            rx_fifo_depth=64
         )
-        self.bus.add_slave(name="ethmac", slave=self.core.mac.bus, region=ethmac_region)
+        self.submodules += dhcp_streamer
-        self.comb += self.platform.request("interrupt").eq(self.core.mac.ev.irq)
+
+        self.comb += [
+            # Connect UDP Sink IOs to UDP Steamer.
+            dhcp_streamer.sink.valid.eq(dhcp_ios.sink_valid),
+            dhcp_streamer.sink.last.eq(dhcp_ios.sink_last),
+            dhcp_ios.sink_ready.eq(dhcp_streamer.sink.ready),
+            dhcp_streamer.sink.data.eq(dhcp_ios.sink_data),
+
+            # Connect UDP Streamer to UDP Source IOs.
+            dhcp_ios.source_valid.eq(dhcp_streamer.source.valid),
+            dhcp_ios.source_last.eq(dhcp_streamer.source.last),
+            dhcp_streamer.source.ready.eq(dhcp_ios.source_ready),
+            dhcp_ios.source_data.eq(dhcp_streamer.source.data),
+        ]
 
         # Pixel port
         data_width = 32

liteeth_cores.py

@@ -1,96 +0,0 @@
-#
-# This file is part of LiteEth.
-#
-# Copyright (c) 2015-2020 Florent Kermarrec <florent@enjoy-digital.fr>
-# SPDX-License-Identifier: BSD-2-Clause
-
-from liteeth.common import *
-from liteeth.mac import LiteEthMAC
-from liteeth.core.arp import LiteEthARP
-from liteeth.core.ip import LiteEthIP
-from liteeth.core.udp import LiteEthUDP
-from liteeth.core.icmp import LiteEthICMP
-
-# IP Core ------------------------------------------------------------------------------------------
-
-class LiteEthIPCore(Module, AutoCSR):
-    def __init__(self, phy, mac_address, ip_address, clk_freq, dw=8,
-        hybrid            = False,
-        with_icmp         = True,
-        with_ip_broadcast = True,
-        with_sys_datapath = False):
-        # Parameters.
-        # -----------
-        ip_address = convert_ip(ip_address)
-
-        # MAC.
-        # ----
-        self.submodules.mac = LiteEthMAC(
-            phy       = phy,
-            dw        = dw,
-            interface = "hybrid" if hybrid else "crossbar",
-            with_preamble_crc = True,
-            with_sys_datapath = with_sys_datapath,
-        )
-
-        # ARP.
-        # ----
-        self.submodules.arp = LiteEthARP(
-            mac         = self.mac,
-            mac_address = mac_address,
-            ip_address  = ip_address,
-            clk_freq    = clk_freq,
-            dw          = dw,
-        )
-
-        # IP.
-        # ---
-        self.submodules.ip  = LiteEthIP(
-            mac            = self.mac,
-            mac_address    = mac_address,
-            ip_address     = ip_address,
-            arp_table      = self.arp.table,
-            with_broadcast = with_ip_broadcast,
-            dw             = dw,
-        )
-        # ICMP (Optional).
-        # ----------------
-        if with_icmp:
-            self.submodules.icmp = LiteEthICMP(
-                ip         = self.ip,
-                ip_address = ip_address,
-                dw         = dw,
-            )
-
-# UDP IP Core --------------------------------------------------------------------------------------
-
-class LiteEthUDPIPCore(LiteEthIPCore):
-    def __init__(self, phy, mac_address, ip_address, clk_freq, dw=8,
-        hybrid=False,
-        with_icmp         = True,
-        with_ip_broadcast = True,
-        with_sys_datapath = False):
-        # Parameters.
-        # -----------
-        ip_address = convert_ip(ip_address)
-
-        # Core: MAC + ARP + IP + (ICMP).
-        # ------------------------------
-        LiteEthIPCore.__init__(self,
-            phy         = phy,
-            mac_address = mac_address,
-            ip_address  = ip_address,
-            clk_freq    = clk_freq,
-            hybrid      = hybrid,
-            with_icmp   = with_icmp,
-            dw          = dw,
-            with_ip_broadcast = with_ip_broadcast,
-            with_sys_datapath = with_sys_datapath,
-        )
-        # UDP.
-        # ----
-        self.submodules.udp = LiteEthUDP(
-            ip         = self.ip,
-            ip_address = ip_address,
-            dw         = dw,
-        )

vhdl/arty_a7.vhdl

@@ -87,19 +87,18 @@ architecture a of arty_a7 is
 
 			ip_address : in std_logic_vector(31 downto 0);
 
-			--== WISHBONE PORT ==--
+			--== DHCP PORT ==--
-			wishbone_adr : in std_logic_vector(29 downto 0);
+			dhcp_ip_address : in std_logic_vector(31 downto 0);
-			wishbone_dat_w : in std_logic_vector(31 downto 0);
+
-			wishbone_dat_r : out std_logic_vector(31 downto 0);
+			dhcp_sink_valid : in std_logic;
-			wishbone_sel : in std_logic_vector(3 downto 0);
+			dhcp_sink_last : in std_logic;
-			wishbone_cyc : in std_logic;
+			dhcp_sink_ready : out std_logic;
-			wishbone_stb : in std_logic;
+			dhcp_sink_data : in std_logic_vector(31 downto 0);
-			wishbone_ack : out std_logic;
+
-			wishbone_we : in std_logic;
+			dhcp_source_valid : out std_logic;
-			wishbone_cti : in std_logic_vector(2 downto 0);
+			dhcp_source_last : out std_logic;
-			wishbone_bte : in std_logic_vector(1 downto 0);
+			dhcp_source_ready : in std_logic;
-			wishbone_err : out std_logic;
+			dhcp_source_data : out std_logic_vector(31 downto 0);
-			interrupt : out std_logic;
 
 			--== PIXEL DATA PORT ==--
 			pixel_bind_port : in std_logic_vector(15 downto 0);
@@ -248,15 +247,12 @@ begin
 
 		ip_address => x"0a141e28", -- 10.20.30.40
 
-		--== WISHBONE PORT ==--
+		dhcp_ip_address => x"0a141e29", -- 10.20.30.41
-		wishbone_adr => (others => '1'),
+		dhcp_sink_valid => '0',
-		wishbone_dat_w => (others => '1'),
+		dhcp_sink_last => '1',
-		wishbone_sel => (others => '1'),
+		dhcp_sink_data => x"cafebebe",
-		wishbone_cyc => '1',
+
-		wishbone_stb => '1',
+		dhcp_source_ready => '1',
-		wishbone_we => '1',
-		wishbone_cti => (others => '1'),
-		wishbone_bte => (others => '1'),
 
 		--== PIXEL DATA PORT ==--
 		pixel_bind_port => x"effd", -- port 61437 - "PIXEL"