Merge branch 'next' of git://git.denx.de/u-boot-avr32

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

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 56eb684d555a0d9a5364d071465cbeafc26630a3..79e910c764095f9ec441707940506fa3e7f72a25 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -51,7 +51,7 @@ 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"
+       "[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 
 int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -220,9 +220,16 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 
 #ifdef CONFIG_AUTOSCRIPT
        if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
-               printf("Running autoscript at addr 0x%08lX ...\n", load_addr);
+               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);
+               rcode = autoscript (load_addr, s);
        }
 #endif
        if (rcode < 0)