diff options
| author | Simon Glass <sjg@chromium.org> | 2011-10-24 18:00:02 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-26 21:33:42 +0200 |
| commit | e4bf0c5cfe1d7b2059a6802c9e11d567c928dbb1 (patch) | |
| tree | b7119fed80e0e6bca1062215762c8ee2e414e747 /common | |
| parent | 4793ee6522f10a3d108de7e47adbcf5f15eb3f46 (diff) | |
| download | talos-obmc-uboot-e4bf0c5cfe1d7b2059a6802c9e11d567c928dbb1.tar.gz talos-obmc-uboot-e4bf0c5cfe1d7b2059a6802c9e11d567c928dbb1.zip | |
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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_elf.c | 6 | ||||
| -rw-r--r-- | common/cmd_net.c | 8 | ||||
| -rw-r--r-- | common/update.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/common/cmd_elf.c b/common/cmd_elf.c index bf3261256f..11ffc1b8aa 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -133,10 +133,10 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* 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 diff --git a/common/cmd_net.c b/common/cmd_net.c index 872f4a69c8..f610385b5d 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 @@ U_BOOT_CMD( 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 @@ static void netboot_update_env (void) #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; diff --git a/common/update.c b/common/update.c index a19f136647..5b1a064c29 100644 --- a/common/update.c +++ b/common/update.c @@ -86,7 +86,7 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr) /* download the update file */ load_addr = addr; copy_filename(BootFile, filename, sizeof(BootFile)); - size = NetLoop(TFTP); + size = NetLoop(TFTPGET); if (size < 0) rv = 1; |
