remove global variable BootFile
Signed-off-by: Sascha Hauer <sha@pengutronix.de>
This commit is contained in:
parent
d78105a55b
commit
2dc2132f0e
|
@ -189,8 +189,6 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
safe_strncpy (BootFile, remotefile, sizeof(BootFile));
|
|
||||||
|
|
||||||
if (NetLoopInit(proto) < 0)
|
if (NetLoopInit(proto) < 0)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
|
|
@ -301,9 +301,6 @@ extern void ArpRequest (void);
|
||||||
|
|
||||||
typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP } proto_t;
|
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 */
|
/* when CDP completes these hold the return values */
|
||||||
extern ushort CDPNativeVLAN;
|
extern ushort CDPNativeVLAN;
|
||||||
extern ushort CDPApplianceVLAN;
|
extern ushort CDPApplianceVLAN;
|
||||||
|
|
|
@ -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];
|
char ip1[16], ip2[16];
|
||||||
|
|
||||||
tftp_filename = BootFile;
|
tftp_filename = filename;
|
||||||
|
|
||||||
printf("TFTP from server %s; our IP address is %s\n"
|
printf("TFTP from server %s; our IP address is %s\n"
|
||||||
"\nFilename '%s'.\nLoading: *\b",
|
"\nFilename '%s'.\nLoading: *\b",
|
||||||
|
|
Loading…
Reference in New Issue