|
20 | 20 | from litex.soc.cores.pwm import PWM |
21 | 21 |
|
22 | 22 | from litex.tools.litex_json2dts_linux import generate_dts |
| 23 | +from litex.soc.integration.soc import add_ip_address_constants |
23 | 24 |
|
24 | 25 | # SoCLinux ----------------------------------------------------------------------------------------- |
25 | 26 |
|
@@ -58,32 +59,8 @@ def add_i2c(self): |
58 | 59 | # Ethernet configuration ------------------------------------------------------------------- |
59 | 60 |
|
60 | 61 | def configure_ethernet(self, remote_ip, local_ip): |
61 | | - remote_ip = remote_ip.split(".") |
62 | | - local_ip = local_ip.split(".") |
63 | | - |
64 | | - try: # FIXME: Improve. |
65 | | - self.constants.pop("REMOTEIP1") |
66 | | - self.constants.pop("REMOTEIP2") |
67 | | - self.constants.pop("REMOTEIP3") |
68 | | - self.constants.pop("REMOTEIP4") |
69 | | - except: |
70 | | - pass |
71 | | - self.add_constant("REMOTEIP1", int(remote_ip[0])) |
72 | | - self.add_constant("REMOTEIP2", int(remote_ip[1])) |
73 | | - self.add_constant("REMOTEIP3", int(remote_ip[2])) |
74 | | - self.add_constant("REMOTEIP4", int(remote_ip[3])) |
75 | | - |
76 | | - try: # FIXME: Improve. |
77 | | - self.constants.pop("LOCALIP1") |
78 | | - self.constants.pop("LOCALIP2") |
79 | | - self.constants.pop("LOCALIP3") |
80 | | - self.constants.pop("LOCALIP4") |
81 | | - except: |
82 | | - pass |
83 | | - self.add_constant("LOCALIP1", int(local_ip[0])) |
84 | | - self.add_constant("LOCALIP2", int(local_ip[1])) |
85 | | - self.add_constant("LOCALIP3", int(local_ip[2])) |
86 | | - self.add_constant("LOCALIP4", int(local_ip[3])) |
| 62 | + add_ip_address_constants(self, "REMOTEIP", remote_ip, check_duplicate=False) |
| 63 | + add_ip_address_constants(self, "LOCALIP", local_ip, check_duplicate=False) |
87 | 64 |
|
88 | 65 | # DTS generation --------------------------------------------------------------------------- |
89 | 66 |
|
|
0 commit comments