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 4d4a1ea9ed5838eabf9ac8090d26e77b0baf0a27..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,50 +76,68 @@ 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 */
 
-static void netboot_update_env(void)
+#if (CONFIG_COMMANDS & CFG_CMD_NFS)
+int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-    char tmp[16] ;
+       return netboot_common(NFS, cmdtp, argc, argv);
+}
 
-    if (NetOurGatewayIP) {
-       ip_to_string (NetOurGatewayIP, tmp);
-       setenv("gatewayip", tmp);
-    }
+U_BOOT_CMD(
+       nfs,    3,      1,      do_nfs,
+       "nfs\t- boot image via network using NFS protocol\n",
+       "[loadAddress] [host ip addr:bootfilename]\n"
+);
+#endif /* CFG_CMD_NFS */
 
-    if (NetOurSubnetMask) {
-       ip_to_string (NetOurSubnetMask, tmp);
-       setenv("netmask", tmp);
-    }
+static void netboot_update_env (void)
+{
+       char tmp[22];
 
-    if (NetOurHostName[0])
-       setenv("hostname", NetOurHostName);
+       if (NetOurGatewayIP) {
+               ip_to_string (NetOurGatewayIP, tmp);
+               setenv ("gatewayip", tmp);
+       }
 
-    if (NetOurRootPath[0])
-       setenv("rootpath", NetOurRootPath);
+       if (NetOurSubnetMask) {
+               ip_to_string (NetOurSubnetMask, tmp);
+               setenv ("netmask", tmp);
+       }
 
-    if (NetOurIP) {
-       ip_to_string (NetOurIP, tmp);
-       setenv("ipaddr", tmp);
-    }
+       if (NetOurHostName[0])
+               setenv ("hostname", NetOurHostName);
 
-    if (NetServerIP) {
-       ip_to_string (NetServerIP, tmp);
-       setenv("serverip", tmp);
-    }
+       if (NetOurRootPath[0])
+               setenv ("rootpath", NetOurRootPath);
 
-    if (NetOurDNSIP) {
-       ip_to_string (NetOurDNSIP, tmp);
-       setenv("dnsip", tmp);
-    }
+       if (NetOurIP) {
+               ip_to_string (NetOurIP, tmp);
+               setenv ("ipaddr", tmp);
+       }
 
-    if (NetOurNISDomain[0])
-       setenv("domain", NetOurNISDomain);
+       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);
+       }
+#endif
+       if (NetOurNISDomain[0])
+               setenv ("domain", NetOurNISDomain);
 }
+
 static int
 netboot_common (int proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
@@ -213,9 +231,52 @@ 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 */
 
+#if (CONFIG_COMMANDS & CFG_CMD_CDP)
+
+static void cdp_update_env(void)
+{
+       char tmp[16];
+
+       if (CDPApplianceVLAN != htons(-1)) {
+               printf("CDP offered appliance VLAN %d\n", ntohs(CDPApplianceVLAN));
+               VLAN_to_string(CDPApplianceVLAN, tmp);
+               setenv("vlan", tmp);
+               NetOurVLAN = CDPApplianceVLAN;
+       }
+
+       if (CDPNativeVLAN != htons(-1)) {
+               printf("CDP offered native VLAN %d\n", ntohs(CDPNativeVLAN));
+               VLAN_to_string(CDPNativeVLAN, tmp);
+               setenv("nvlan", tmp);
+               NetOurNativeVLAN = CDPNativeVLAN;
+       }
+
+}
+
+int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+       int r;
+
+       r = NetLoop(CDP);
+       if (r < 0) {
+               printf("cdp failed; perhaps not a CISCO switch?\n");
+               return 1;
+       }
+
+       cdp_update_env();
+
+       return 0;
+}
+
+U_BOOT_CMD(
+       cdp,    1,      1,      do_cdp,
+       "cdp\t- Perform CDP network configuration\n",
+);
+#endif /* CFG_CMD_CDP */
+
 #endif /* CFG_CMD_NET */