From: Bin Meng <bmeng.cn@gmail.com>
Date: Thu, 8 Oct 2015 03:19:16 +0000 (-0700)
Subject: cmd: bootvx: Pass netmask and gatewayip to VxWorks bootline
X-Git-Tag: v2016.01-rc1~298^2~42
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a4092dbd81ad8bcd7d405304f579b0b5b0c402ce;p=u-boot

cmd: bootvx: Pass netmask and gatewayip to VxWorks bootline

There are fields in VxWorks bootline for netmask and gatewayip.
We can get these from U-Boot environment variables and pass them
to VxWorks, just like ipaddr and serverip.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 6c95851642..6a0937823f 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -288,13 +288,26 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 				       CONFIG_SYS_VXWORKS_SERVERNAME);
 
 		tmp = getenv("ipaddr");
-		if (tmp)
-			ptr += sprintf(build_buf + ptr, "e=%s ", tmp);
+		if (tmp) {
+			ptr += sprintf(build_buf + ptr, "e=%s", tmp);
+			tmp = getenv("netmask");
+			if (tmp) {
+				__be32 addr = getenv_ip("netmask").s_addr;
+				ptr += sprintf(build_buf + ptr, ":%08x ",
+					       ntohl(addr));
+			} else {
+				ptr += sprintf(build_buf + ptr, " ");
+			}
+		}
 
 		tmp = getenv("serverip");
 		if (tmp)
 			ptr += sprintf(build_buf + ptr, "h=%s ", tmp);
 
+		tmp = getenv("gatewayip");
+		if (tmp)
+			ptr += sprintf(build_buf + ptr, "g=%s ", tmp);
+
 		tmp = getenv("hostname");
 		if (tmp)
 			ptr += sprintf(build_buf + ptr, "tn=%s ", tmp);