Allow usage of network gateway and subnets in SoC generation

Author: ryanhaus

make.py

@@ -57,6 +57,9 @@ def main():
     parser.add_argument("--doc",            action="store_true",         help="Build documentation.")
     parser.add_argument("--local-ip",       default="192.168.1.50",      help="Local IP address.")
     parser.add_argument("--remote-ip",      default="192.168.1.100",     help="Remote IP address of TFTP server.")
+    parser.add_argument("--use-gateway",    action="store_true",         help="Use a network gateway for out-of-subnet TFTP servers.")
+    parser.add_argument("--gateway-ip",     default="192.168.1.1",       help="Default gateway IP address.")
+    parser.add_argument("--subnet-mask",    default="255.255.255.0",     help="Subnet mask.")
     parser.add_argument("--spi-data-width", default=8,   type=int,       help="SPI data width (max bits per xfer).")
     parser.add_argument("--spi-clk-freq",   default=1e6, type=int,       help="SPI clock frequency.")
     parser.add_argument("--fdtoverlays",    default="",                  help="Device Tree Overlays to apply.")
@@ -159,7 +162,13 @@ def main():
         if "sdcard" in board.soc_capabilities:
             soc.add_sdcard()
         if "ethernet" in board.soc_capabilities:
-            soc.configure_ethernet(remote_ip=args.remote_ip, local_ip=args.local_ip)
+            soc.configure_ethernet(
+                remote_ip   = args.remote_ip,
+                local_ip    = args.local_ip,
+                use_gateway = args.use_gateway,
+                gateway_ip  = args.gateway_ip,
+                subnet_mask = args.subnet_mask
+            )
         #if "leds" in board.soc_capabilities:
         #    soc.add_leds()
         if "rgb_led" in board.soc_capabilities:

soc_linux.py

@@ -57,9 +57,11 @@ def add_i2c(self):
 
         # Ethernet configuration -------------------------------------------------------------------
 
-        def configure_ethernet(self, remote_ip, local_ip):
+        def configure_ethernet(self, remote_ip, local_ip, use_gateway, gateway_ip, subnet_mask):
             remote_ip = remote_ip.split(".")
             local_ip = local_ip.split(".")
+            gateway_ip = gateway_ip.split(".")
+            subnet_mask = subnet_mask.split(".")
 
             try: # FIXME: Improve.
                 self.constants.pop("REMOTEIP1")
@@ -85,6 +87,33 @@ def configure_ethernet(self, remote_ip, local_ip):
             self.add_constant("LOCALIP3", int(local_ip[2]))
             self.add_constant("LOCALIP4", int(local_ip[3]))
 
+            try: # FIXME: Improve.
+                self.constants.pop("GATEWAYIP1")
+                self.constants.pop("GATEWAYIP2")
+                self.constants.pop("GATEWAYIP3")
+                self.constants.pop("GATEWAYIP4")
+            except:
+                pass
+            self.add_constant("GATEWAYIP1", int(gateway_ip[0]))
+            self.add_constant("GATEWAYIP2", int(gateway_ip[1]))
+            self.add_constant("GATEWAYIP3", int(gateway_ip[2]))
+            self.add_constant("GATEWAYIP4", int(gateway_ip[3]))
+
+            try: # FIXME: Improve.
+                self.constants.pop("SUBNETMASK1")
+                self.constants.pop("SUBNETMASK2")
+                self.constants.pop("SUBNETMASK3")
+                self.constants.pop("SUBNETMASK4")
+            except:
+                pass
+            self.add_constant("SUBNETMASK1", int(subnet_mask[0]))
+            self.add_constant("SUBNETMASK2", int(subnet_mask[1]))
+            self.add_constant("SUBNETMASK3", int(subnet_mask[2]))
+            self.add_constant("SUBNETMASK4", int(subnet_mask[3]))
+
+            if use_gateway:
+                self.add_constant("ETH_NETBOOT_USE_GATEWAY")
+
         # DTS generation ---------------------------------------------------------------------------
 
         def generate_dts(self, board_name, rootfs="ram0"):