X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fcmd_net.c;h=af691a474f652fa862b28b08802e5f57c2bdf0a8;hb=055b12f2ffd7c34eea7e983a0588b24f2e69e0e3;hp=dbf6b861b1bdd9b6b0c62ce637e4869eabb4fbf9;hpb=10bbb38a402a2faf18858c451bcdc63d45888e6e;p=oweals%2Fu-boot.git

diff --git a/common/cmd_net.c b/common/cmd_net.c
index dbf6b861b1..af691a474f 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -39,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"
+	"bootp\t- boot image via network using BOOTP/TFTP protocol\n",
+	"[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 
 int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -62,7 +62,7 @@ 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"
+	"[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 
 #if defined(CONFIG_CMD_DHCP)
@@ -73,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"
+	"dhcp\t- boot image via network using DHCP/TFTP protocol\n",
+	"[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 #endif
 
@@ -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)