diff options
| author | Simon Glass <sjg@chromium.org> | 2011-10-24 18:00:02 +0000 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2011-11-17 17:09:51 -0800 |
| commit | 52d640d58d0bba723df03de4493cdcab167ca2ee (patch) | |
| tree | 744de14e4752c84655929a6a54237a597c7b66c3 /common | |
| parent | da7491fc37940f82c15b44b03dfd209502235756 (diff) | |
BACKPORT: 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.
(cherry-picked from e4bf0c5)
Change-Id: I90d03045de0231553a693f7119bdcc67a908e3c9
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/11796
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 ac06fac1ce..a6d28e5f5e 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[]) { @@ -46,7 +46,7 @@ int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int ret; bootstage_mark(BOOTSTAGE_KERNELREAD_START, "tftp start"); - ret = netboot_common(TFTP, cmdtp, argc, argv); + ret = netboot_common(TFTPGET, cmdtp, argc, argv); bootstage_mark(BOOTSTAGE_KERNELREAD_STOP, "tftp done"); return ret; } @@ -172,8 +172,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 7528474873..8f9e9319c5 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; |