cmd_mmc: add support for device command for selecting mmc device

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

diff --git a/common/cmd_net.c b/common/cmd_net.c
index fa4f968a0d42ba79547f60362e4d741529622214..92bbf85d1139a4acdf2df3670070a0d6059bec63 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -28,16 +28,6 @@
 #include <command.h>
 #include <net.h>
 
-#if defined(CONFIG_CMD_NET)
-
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-extern void show_boot_progress (int val);
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress (arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-
 extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
 
 static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]);
@@ -49,8 +39,8 @@ int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        bootp,  3,      1,      do_bootp,
-       "bootp\t- boot image via network using BootP/TFTP protocol\n",
-       "[loadAddress] [bootfilename]\n"
+       "boot image via network using BOOTP/TFTP protocol",
+       "[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 
 int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -60,8 +50,8 @@ int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        tftpboot,       3,      1,      do_tftpb,
-       "tftpboot- boot image via network using TFTP protocol\n",
-       "[loadAddress] [bootfilename]\n"
+       "boot image via network using TFTP protocol",
+       "[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 
 int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -71,8 +61,8 @@ int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        rarpboot,       3,      1,      do_rarpb,
-       "rarpboot- boot image via network using RARP/TFTP protocol\n",
-       "[loadAddress] [bootfilename]\n"
+       "boot image via network using RARP/TFTP protocol",
+       "[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 
 #if defined(CONFIG_CMD_DHCP)
@@ -83,8 +73,8 @@ int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        dhcp,   3,      1,      do_dhcp,
-       "dhcp\t- invoke DHCP client to obtain IP/boot params\n",
-       "\n"
+       "boot image via network using DHCP/TFTP protocol",
+       "[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 #endif
 
@@ -96,8 +86,8 @@ int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        nfs,    3,      1,      do_nfs,
-       "nfs\t- boot image via network using NFS protocol\n",
-       "[loadAddress] [host ip addr:bootfilename]\n"
+       "boot image via network using NFS protocol",
+       "[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 #endif
 
@@ -164,8 +154,10 @@ static int
 netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
        char *s;
+       char *end;
        int   rcode = 0;
        int   size;
+       ulong addr;
 
        /* pre-set load_addr */
        if ((s = getenv("loadaddr")) != NULL) {
@@ -176,15 +168,17 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
        case 1:
                break;
 
-       case 2: /* only one arg - accept two forms:
-                * just load address, or just boot file name.
-                * The latter form must be written "filename" here.
+       case 2: /*
+                * Only one arg - accept two forms:
+                * Just load address, or just boot file name. The latter
+                * form must be written in a format which can not be
+                * mis-interpreted as a valid number.
                 */
-               if (argv[1][0] == '"') {        /* just boot filename */
-                       copy_filename (BootFile, argv[1], sizeof(BootFile));
-               } else {                        /* load address */
-                       load_addr = simple_strtoul(argv[1], NULL, 16);
-               }
+               addr = simple_strtoul(argv[1], &end, 16);
+               if (end == (argv[1] + strlen(argv[1])))
+                       load_addr = addr;
+               else
+                       copy_filename(BootFile, argv[1], sizeof(BootFile));
                break;
 
        case 3: load_addr = simple_strtoul(argv[1], NULL, 16);
@@ -192,24 +186,24 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 
                break;
 
-       default: printf ("Usage:\n%s\n", cmdtp->usage);
-               SHOW_BOOT_PROGRESS(-80);
+       default: cmd_usage(cmdtp);
+               show_boot_progress (-80);
                return 1;
        }
 
-       SHOW_BOOT_PROGRESS(80);
+       show_boot_progress (80);
        if ((size = NetLoop(proto)) < 0) {
-               SHOW_BOOT_PROGRESS(-81);
+               show_boot_progress (-81);
                return 1;
        }
 
-       SHOW_BOOT_PROGRESS(81);
+       show_boot_progress (81);
        /* NetLoop ok, update environment */
        netboot_update_env();
 
        /* done if no file was loaded (no errors though) */
        if (size == 0) {
-               SHOW_BOOT_PROGRESS(-82);
+               show_boot_progress (-82);
                return 0;
        }
 
@@ -224,23 +218,29 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 
                printf ("Automatic boot of image at addr 0x%08lX ...\n",
                        load_addr);
-               SHOW_BOOT_PROGRESS(82);
+               show_boot_progress (82);
                rcode = do_bootm (cmdtp, 0, 1, local_args);
        }
 
-#ifdef CONFIG_AUTOSCRIPT
+#ifdef CONFIG_SOURCE
        if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
-               printf("Running autoscript at addr 0x%08lX ...\n", load_addr);
-               SHOW_BOOT_PROGRESS(83);
-               rcode = autoscript (load_addr);
+               printf ("Running \"source\" command at addr 0x%08lX",
+                       load_addr);
+
+               s = getenv ("autoscript_uname");
+               if (s)
+                       printf (":%s ...\n", s);
+               else
+                       puts (" ...\n");
+
+               show_boot_progress (83);
+               rcode = source (load_addr, s);
        }
 #endif
-#if defined(CONFIG_SHOW_BOOT_PROGRESS)
        if (rcode < 0)
-               SHOW_BOOT_PROGRESS(-83);
+               show_boot_progress (-83);
        else
-               SHOW_BOOT_PROGRESS(84);
-#endif
+               show_boot_progress (84);
        return rcode;
 }
 
@@ -252,7 +252,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        NetPingIP = string_to_ip(argv[1]);
        if (NetPingIP == 0) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return -1;
        }
 
@@ -268,7 +268,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        ping,   2,      1,      do_ping,
-       "ping\t- send ICMP ECHO_REQUEST to network host\n",
+       "send ICMP ECHO_REQUEST to network host",
        "pingAddress\n"
 );
 #endif
@@ -312,7 +312,7 @@ int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        cdp,    1,      1,      do_cdp,
-       "cdp\t- Perform CDP network configuration\n",
+       "Perform CDP network configuration",
 );
 #endif
 
@@ -349,9 +349,7 @@ int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        sntp,   2,      1,      do_sntp,
-       "sntp\t- synchronize RTC via network\n",
+       "synchronize RTC via network",
        "[NTP server IP]\n"
 );
 #endif
-
-#endif