targets/vivaldi_ml1: Fix dual Ethernet build

Update the target to use the current CSR handler API for the two RMII PHYs.

Only attach BIOS/libliteeth network constants to the primary ethmac instance. The secondary ethmac1 instance is still instantiated and memory mapped for hardware/custom software use, but the current LiteX BIOS Ethernet stack is tied to CSR_ETHMAC_BASE and should not receive duplicate LOCALIP/REMOTEIP constants.

With the corresponding LiteX bus allocation fix, --with-ethernet now generates non-overlapping ethmac/ethmac1 SRAM windows.

Author: enjoy-digital

litex_boards/targets/machdyne_vivaldi_ml1.py

@@ -159,18 +159,25 @@ def __init__(self, revision="v2", device="45F", sdram_rate="1:2", sys_clk_freq=i
                 pads = platform.request("eth", 0),
                 with_hw_init_reset=True,
                 refclk_cd="eth")
-            self.add_csr("ethphy")
-            self.add_ethernet(name="ethmac", phy=self.ethphy,
-                phy_cd="ethphy_eth", dynamic_ip=eth_dynamic_ip, local_ip=eth_ip, remote_ip=remote_ip)
+            self.csr.add("ethphy")
+            self.add_ethernet(
+                name       = "ethmac",
+                phy        = self.ethphy,
+                phy_cd     = "ethphy_eth",
+                dynamic_ip = eth_dynamic_ip,
+                local_ip   = None if eth_dynamic_ip else eth_ip,
+                remote_ip  = remote_ip)
 
             self.ethphy1 = LiteEthPHYRMII(
                 clock_pads=None,
                 pads = platform.request("eth", 1),
                 with_hw_init_reset=True,
                 refclk_cd="eth")
-            self.add_csr("ethphy1")
-            self.add_ethernet(name="ethmac1", phy=self.ethphy1,
-                phy_cd="ethphy1_eth", dynamic_ip=eth_dynamic_ip, local_ip=eth_ip, remote_ip=remote_ip)
+            self.csr.add("ethphy1")
+            self.add_ethernet(
+                name   = "ethmac1",
+                phy    = self.ethphy1,
+                phy_cd = "ethphy1_eth")
 
 # Build --------------------------------------------------------------------------------------------