Add cerf250 to MAINTAINERS and README

[karo-tx-uboot.git] / common / cmd_net.c

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 85a90237342796f7e835e06a73771620cec1b655..47f9622fad5e36254ddf31b1c49173b4cc0ecf69 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -42,7 +42,7 @@ int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        bootp,  3,      1,      do_bootp,
-       "bootp   - boot image via network using BootP/TFTP protocol\n",
+       "bootp\t- boot image via network using BootP/TFTP protocol\n",
        "[loadAddress] [bootfilename]\n"
 );
 
@@ -76,7 +76,7 @@ int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        dhcp,   3,      1,      do_dhcp,
-       "dhcp    - invoke DHCP client to obtain IP/boot params\n",
+       "dhcp\t- invoke DHCP client to obtain IP/boot params\n",
        "\n"
 );
 #endif /* CFG_CMD_DHCP */
@@ -89,67 +89,55 @@ int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        nfs,    3,      1,      do_nfs,
-       "nfs    - boot image via network using NFS protocol\n",
+       "nfs\t- boot image via network using NFS protocol\n",
        "[loadAddress] [host ip addr:bootfilename]\n"
 );
 #endif /* CFG_CMD_NFS */
 
-static void netboot_update_env(void)
+static void netboot_update_env (void)
 {
-    char tmp[22] ;
+       char tmp[22];
 
-    if (NetOurGatewayIP) {
-       ip_to_string (NetOurGatewayIP, tmp);
-       setenv("gatewayip", tmp);
-    }
-
-    if (NetOurSubnetMask) {
-       ip_to_string (NetOurSubnetMask, tmp);
-       setenv("netmask", tmp);
-    }
+       if (NetOurGatewayIP) {
+               ip_to_string (NetOurGatewayIP, tmp);
+               setenv ("gatewayip", tmp);
+       }
 
-    if (NetOurHostName[0])
-       setenv("hostname", NetOurHostName);
+       if (NetOurSubnetMask) {
+               ip_to_string (NetOurSubnetMask, tmp);
+               setenv ("netmask", tmp);
+       }
 
-    if (NetOurRootPath[0])
-       setenv("rootpath", NetOurRootPath);
+       if (NetOurHostName[0])
+               setenv ("hostname", NetOurHostName);
 
-    if (NetOurIP) {
-       ip_to_string (NetOurIP, tmp);
-       setenv("ipaddr", tmp);
-    }
+       if (NetOurRootPath[0])
+               setenv ("rootpath", NetOurRootPath);
 
-    if (NetServerIP) {
-       ip_to_string (NetServerIP, tmp);
-       setenv("serverip", tmp);
-    }
+       if (NetOurIP) {
+               ip_to_string (NetOurIP, tmp);
+               setenv ("ipaddr", tmp);
+       }
 
-    if (NetOurDNSIP) {
-       ip_to_string (NetOurDNSIP, tmp);
-       setenv("dnsip", tmp);
-    }
+       if (NetServerIP) {
+               ip_to_string (NetServerIP, tmp);
+               setenv ("serverip", tmp);
+       }
 
+       if (NetOurDNSIP) {
+               ip_to_string (NetOurDNSIP, tmp);
+               setenv ("dnsip", tmp);
+       }
 #if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_DNS2)
-    if (NetOurDNS2IP) {
-           ip_to_string (NetOurDNS2IP, tmp);
-           setenv("dnsip2", tmp);
-    }
+       if (NetOurDNS2IP) {
+               ip_to_string (NetOurDNS2IP, tmp);
+               setenv ("dnsip2", tmp);
+       }
 #endif
-
-    if (NetOurNISDomain[0])
-       setenv("domain", NetOurNISDomain);
-
-    if (ntohs(NetOurVLAN) != (ushort)-1) {
-           VLAN_to_string(NetOurVLAN, tmp);
-           setenv("vlan", tmp);
-    }
-
-    if (ntohs(NetOurNativeVLAN) != (ushort)-1) {
-           VLAN_to_string(NetOurNativeVLAN, tmp);
-           setenv("vlan", tmp);
-    }
-
+       if (NetOurNISDomain[0])
+               setenv ("domain", NetOurNISDomain);
 }
+
 static int
 netboot_common (int proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
@@ -243,7 +231,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        ping,   2,      1,      do_ping,
-       "ping    - send ICMP ECHO_REQUEST to network host\n",
+       "ping\t- send ICMP ECHO_REQUEST to network host\n",
        "pingAddress\n"
 );
 #endif /* CFG_CMD_PING */
@@ -287,7 +275,7 @@ int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        cdp,    1,      1,      do_cdp,
-       "cdp     - Perform CDP network configuration\n",
+       "cdp\t- Perform CDP network configuration\n",
 );
 #endif /* CFG_CMD_CDP */