Skip to content

Commit 6f65868

Browse files
committed
make.py,soc_linux.py: fix build when board has ethernet capability: local_ip constant is automatically applied by soc -> add_ethernet (#394)
1 parent ea17e31 commit 6f65868

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

make.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ def main():
934934
if "sdcard" in board.soc_capabilities:
935935
soc.add_sdcard()
936936
if "ethernet" in board.soc_capabilities:
937-
soc.configure_ethernet(local_ip=args.local_ip, remote_ip=args.remote_ip)
937+
soc.configure_ethernet(remote_ip=args.remote_ip)
938938
#if "leds" in board.soc_capabilities:
939939
# soc.add_leds()
940940
if "rgb_led" in board.soc_capabilities:

soc_linux.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,9 @@ def add_mmcm(self, nclkout):
110110
self.comb += self.mmcm.reset.eq(self.mmcm.drp_reset.re)
111111

112112
# Ethernet configuration -------------------------------------------------------------------
113-
def configure_ethernet(self, local_ip, remote_ip):
114-
local_ip = local_ip.split(".")
113+
def configure_ethernet(self, remote_ip):
115114
remote_ip = remote_ip.split(".")
116115

117-
self.add_constant("LOCALIP1", int(local_ip[0]))
118-
self.add_constant("LOCALIP2", int(local_ip[1]))
119-
self.add_constant("LOCALIP3", int(local_ip[2]))
120-
self.add_constant("LOCALIP4", int(local_ip[3]))
121-
122116
self.add_constant("REMOTEIP1", int(remote_ip[0]))
123117
self.add_constant("REMOTEIP2", int(remote_ip[1]))
124118
self.add_constant("REMOTEIP3", int(remote_ip[2]))

0 commit comments

Comments
 (0)