gitignore: ignore __pycache__

.gitignore

@@ -1,2 +1,3 @@
 /work/
 *.o
+__pycache__

firmware/Cargo.toml

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

firmware/src/main.rs

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

gen_liteeth.py

@@ -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

vhdl/arty_a7.vhdl

@@ -36,7 +36,7 @@ entity arty_a7 is
 		-- when necessary
 		pmod_a : out std_logic_vector(7 downto 0);
 		pmod_b : out std_logic_vector(7 downto 0);
-		pmod_c : in std_logic_vector(7 downto 0);
+		pmod_c : out std_logic_vector(7 downto 0);
 		pmod_d : out std_logic_vector(7 downto 0);
 
 		clock_100mhz : in std_logic;
@@ -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"
@@ -324,9 +320,20 @@ begin
 
 	sys_reset <= not pll_locked or not n_reset;
 
-	pmod_a <= drivers(7 downto 0);
+	pmod_a <= "00" & drivers(5 downto 0);
-	pmod_b <= drivers(15 downto 8);
+	pmod_b <= "00" & drivers(11 downto 6);
-	pmod_d <= drivers(23 downto 16);
+
+	pmod_c(7) <= '0';
+	pmod_c(6) <= '0';
+	pmod_c(5) <= drivers(17);
+	pmod_c(4) <= drivers(16);
+	pmod_c(3) <= drivers(15);
+	pmod_c(2) <= drivers(14);
+	-- workaround for https://github.com/gatecat/nextpnr-xilinx/issues/42#issuecomment-1183525828
+	pmod_c(1) <= drivers(12);
+	pmod_c(0) <= drivers(13);
+
+	pmod_d <= "00" & drivers(23 downto 18);
 
 	sender: process(sys_clk)
 	begin