Revert "boot cmds: convert to getenv_yesno() with autostart"

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

diff --git a/common/cmd_net.c b/common/cmd_net.c
index a6878491998afaa299f77ad06306bff83e028939..8c6f5c8c3dd29d57c65bb896581708c44746d415 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -28,11 +28,9 @@
 #include <command.h>
 #include <net.h>
 
-extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
+static int netboot_common (proto_t, cmd_tbl_t *, int , char * const []);
 
-static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]);
-
-int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        return netboot_common (BOOTP, cmdtp, argc, argv);
 }
@@ -40,10 +38,10 @@ int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        bootp,  3,      1,      do_bootp,
        "boot image via network using BOOTP/TFTP protocol",
-       "[loadAddress] [[hostIPaddr:]bootfilename]\n"
+       "[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 
-int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        return netboot_common (TFTP, cmdtp, argc, argv);
 }
@@ -51,10 +49,11 @@ int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        tftpboot,       3,      1,      do_tftpb,
        "boot image via network using TFTP protocol",
-       "[loadAddress] [[hostIPaddr:]bootfilename]\n"
+       "[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 
-int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+#ifdef CONFIG_CMD_RARP
+int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        return netboot_common (RARP, cmdtp, argc, argv);
 }
@@ -62,11 +61,12 @@ int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        rarpboot,       3,      1,      do_rarpb,
        "boot image via network using RARP/TFTP protocol",
-       "[loadAddress] [[hostIPaddr:]bootfilename]\n"
+       "[loadAddress] [[hostIPaddr:]bootfilename]"
 );
+#endif
 
 #if defined(CONFIG_CMD_DHCP)
-int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        return netboot_common(DHCP, cmdtp, argc, argv);
 }
@@ -74,12 +74,12 @@ int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        dhcp,   3,      1,      do_dhcp,
        "boot image via network using DHCP/TFTP protocol",
-       "[loadAddress] [[hostIPaddr:]bootfilename]\n"
+       "[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 #endif
 
 #if defined(CONFIG_CMD_NFS)
-int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        return netboot_common(NFS, cmdtp, argc, argv);
 }
@@ -87,7 +87,7 @@ int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        nfs,    3,      1,      do_nfs,
        "boot image via network using NFS protocol",
-       "[loadAddress] [[hostIPaddr:]bootfilename]\n"
+       "[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 #endif
 
@@ -151,7 +151,7 @@ static void netboot_update_env (void)
 }
 
 static int
-netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
+netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char * const argv[])
 {
        char *s;
        char *end;
@@ -186,9 +186,9 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 
                break;
 
-       default: cmd_usage(cmdtp);
+       default:
                show_boot_progress (-80);
-               return 1;
+               return cmd_usage(cmdtp);
        }
 
        show_boot_progress (80);
@@ -222,20 +222,6 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
                rcode = do_bootm (cmdtp, 0, 1, local_args);
        }
 
-#ifdef CONFIG_AUTOSCRIPT
-       if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
-               printf ("Running autoscript at addr 0x%08lX", load_addr);
-
-               s = getenv ("autoscript_uname");
-               if (s)
-                       printf (":%s ...\n", s);
-               else
-                       puts (" ...\n");
-
-               show_boot_progress (83);
-               rcode = autoscript (load_addr, s);
-       }
-#endif
        if (rcode < 0)
                show_boot_progress (-83);
        else
@@ -244,16 +230,14 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 }
 
 #if defined(CONFIG_CMD_PING)
-int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        if (argc < 2)
                return -1;
 
        NetPingIP = string_to_ip(argv[1]);
-       if (NetPingIP == 0) {
-               cmd_usage(cmdtp);
-               return -1;
-       }
+       if (NetPingIP == 0)
+               return cmd_usage(cmdtp);
 
        if (NetLoop(PING) < 0) {
                printf("ping failed; host %s is not alive\n", argv[1]);
@@ -268,7 +252,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        ping,   2,      1,      do_ping,
        "send ICMP ECHO_REQUEST to network host",
-       "pingAddress\n"
+       "pingAddress"
 );
 #endif
 
@@ -294,7 +278,7 @@ static void cdp_update_env(void)
 
 }
 
-int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int r;
 
@@ -312,11 +296,12 @@ int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        cdp,    1,      1,      do_cdp,
        "Perform CDP network configuration",
+       "\n"
 );
 #endif
 
 #if defined(CONFIG_CMD_SNTP)
-int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        char *toff;
 
@@ -352,3 +337,49 @@ U_BOOT_CMD(
        "[NTP server IP]\n"
 );
 #endif
+
+#if defined(CONFIG_CMD_DNS)
+int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       if (argc == 1)
+               return cmd_usage(cmdtp);
+
+       /*
+        * We should check for a valid hostname:
+        * - Each label must be between 1 and 63 characters long
+        * - the entire hostname has a maximum of 255 characters
+        * - only the ASCII letters 'a' through 'z' (case-insensitive),
+        *   the digits '0' through '9', and the hyphen
+        * - cannot begin or end with a hyphen
+        * - no other symbols, punctuation characters, or blank spaces are
+        *   permitted
+        * but hey - this is a minimalist implmentation, so only check length
+        * and let the name server deal with things.
+        */
+       if (strlen(argv[1]) >= 255) {
+               printf("dns error: hostname too long\n");
+               return 1;
+       }
+
+       NetDNSResolve = argv[1];
+
+       if (argc == 3)
+               NetDNSenvvar = argv[2];
+       else
+               NetDNSenvvar = NULL;
+
+       if (NetLoop(DNS) < 0) {
+               printf("dns lookup of %s failed, check setup\n", argv[1]);
+               return 1;
+       }
+
+       return 0;
+}
+
+U_BOOT_CMD(
+       dns,    3,      1,      do_dns,
+       "lookup the IP of a hostname",
+       "hostname [envvar]"
+);
+
+#endif /* CONFIG_CMD_DNS */