colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: Consolidate the parsing of bootfile

Browse Source 
The same basic parsing was implemented in tftp and nfs, so add a helper
function to do the work once.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Joe Hershberger
2018-07-03 19:36:43 -05:00
parent f43308fa0c
commit 6ab1283092
4 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net/nfs.c
View File

@@ -859,7 +859,8 @@ void nfs_start(void)
return;
}
if (net_boot_file_name[0] == '\0') {
if (!net_parse_bootfile(&nfs_server_ip, nfs_path,
sizeof(nfs_path_buff))) {
sprintf(nfs_path, "/nfsroot/%02X%02X%02X%02X.img",
net_ip.s_addr & 0xFF,
(net_ip.s_addr >> 8) & 0xFF,
@@ -868,18 +869,6 @@ void nfs_start(void)
printf("*** Warning: no boot file name; using '%s'\n",
nfs_path);
} else {
char *p = net_boot_file_name;
p = strchr(p, ':');
if (p != NULL) {
nfs_server_ip = string_to_ip(net_boot_file_name);
++p;
strcpy(nfs_path, p);
} else {
strcpy(nfs_path, net_boot_file_name);
}
}
nfs_filename = basename(nfs_path);