sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

remove global variable BootFile 

Signed-off-by: Sascha Hauer <sha@pengutronix.de>
This commit is contained in:
Sascha Hauer 2009-10-17 11:37:23 +02:00 committed by Sascha Hauer
parent d78105a55b
commit 2dc2132f0e
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/net.c
View File

@ -189,8 +189,6 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
return 1;
}
safe_strncpy (BootFile, remotefile, sizeof(BootFile));
if (NetLoopInit(proto) < 0)
goto out;

3
include/net.h
View File

@ -301,9 +301,6 @@ extern void ArpRequest (void);
typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP } proto_t;
/* from net/net.c */
extern char BootFile[128]; /* Boot File name */
/* when CDP completes these hold the return values */
extern ushort CDPNativeVLAN;
extern ushort CDPApplianceVLAN;

4
net/tftp.c
View File

@ -227,11 +227,11 @@ static void TftpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
}
}
void TftpStart(void)
void TftpStart(char *filename)
{
char ip1[16], ip2[16];
tftp_filename = BootFile;
tftp_filename = filename;
printf("TFTP from server %s; our IP address is %s\n"
"\nFilename '%s'.\nLoading: *\b",