diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-04-08 01:41:02 -0500 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-04-18 11:11:32 -0600 |
| commit | 1411157d857840da444db63f6ba3a3a658a99c5b (patch) | |
| tree | 472a608659ae85e46e876789bc52a8f38d160237 /include/net.h | |
| parent | 049a95a7759c0e384c1fc7b8575d968d56a33997 (diff) | |
| download | blackbird-obmc-uboot-1411157d857840da444db63f6ba3a3a658a99c5b.tar.gz blackbird-obmc-uboot-1411157d857840da444db63f6ba3a3a658a99c5b.zip | |
net: cosmetic: Fixup var names related to boot file
The variables around the bootfile were inconsistent and used CamelCase.
Update them to make the code more readable.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/net.h')
| -rw-r--r-- | include/net.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/net.h b/include/net.h index a19f7a1e69..c16744af6c 100644 --- a/include/net.h +++ b/include/net.h @@ -476,9 +476,7 @@ extern struct in_addr net_dns_server2; extern char NetOurNISDomain[32]; /* Our NIS domain */ extern char NetOurHostName[32]; /* Our hostname */ extern char NetOurRootPath[64]; /* Our root path */ -extern ushort NetBootFileSize; /* Our boot file size in blocks */ /** END OF BOOTP EXTENTIONS **/ -extern ulong NetBootFileXferSize; /* size of bootfile in bytes */ extern uchar NetOurEther[6]; /* Our ethernet address */ extern uchar NetServerEther[6]; /* Boot server enet address */ extern struct in_addr net_ip; /* Our IP addr (0 = unknown) */ @@ -507,8 +505,11 @@ enum proto_t { TFTPSRV, TFTPPUT, LINKLOCAL }; -/* from net/net.c */ -extern char BootFile[128]; /* Boot File name */ +extern char net_boot_file_name[128];/* Boot File name */ +/* The actual transferred size of the bootfile (in bytes) */ +extern u32 net_boot_file_size; +/* Boot file size in blocks as reported by the DHCP server */ +extern u32 net_boot_file_expected_size_in_blocks; #if defined(CONFIG_CMD_DNS) extern char *NetDNSResolve; /* The host to resolve */ |
