commit e4bf0c5cfe1d7b2059a6802c9e11d567c928dbb1
author Simon Glass <sjg@chromium.org> Mon Oct 24 18:00:02 2011 +0000
committer Wolfgang Denk <wd@denx.de> Wed Oct 26 21:33:42 2011 +0200
tree b7119fed80e0e6bca1062215762c8ee2e414e747
parent 4793ee6522f10a3d108de7e47adbcf5f15eb3f46

net: tftpput: Rename TFTP to TFTPGET

This is a better name for this protocol. Also remove the typedef to keep
checkpatch happy, and move zeroing of NetBootFileXferSize a little
earlier since TFTPPUT will need to change this.

Signed-off-by: Simon Glass <sjg@chromium.org>

common/cmd_elf.c

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index bf32612..11ffc1b 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -133,10 +133,10 @@
 	/* Check to see if we need to tftp the image ourselves before starting */
 
 	if ((argc == 2) && (strcmp (argv[1], "tftp") == 0)) {
-		if (NetLoop (TFTP) <= 0)
+		if (NetLoop(TFTPGET) <= 0)
 			return 1;
-		printf ("Automatic boot of VxWorks image at address 0x%08lx ... \n",
-		     addr);
+		printf("Automatic boot of VxWorks image at address 0x%08lx "
+			"...\n", addr);
 	}
 #endif
 

common/cmd_net.c

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 872f4a6..f610385 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -28,7 +28,7 @@
 #include <command.h>
 #include <net.h>
 
-static int netboot_common (proto_t, cmd_tbl_t *, int , char * const []);
+static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
 
 int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
@@ -43,7 +43,7 @@
 
 int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	return netboot_common (TFTP, cmdtp, argc, argv);
+	return netboot_common(TFTPGET, cmdtp, argc, argv);
 }
 
 U_BOOT_CMD(
@@ -167,8 +167,8 @@
 #endif
 }
 
-static int
-netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char * const argv[])
+static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
+		char * const argv[])
 {
 	char *s;
 	char *end;

common/update.c

diff --git a/common/update.c b/common/update.c
index a19f136..5b1a064 100644
--- a/common/update.c
+++ b/common/update.c
@@ -86,7 +86,7 @@
 	/* download the update file */
 	load_addr = addr;
 	copy_filename(BootFile, filename, sizeof(BootFile));
-	size = NetLoop(TFTP);
+	size = NetLoop(TFTPGET);
 
 	if (size < 0)
 		rv = 1;