mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-05 04:36:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: Return the load address from parse_args()

Browse Source 
Rather than updating the global, update the value of a parameter, so the
action of the function is simpler.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2025-03-05 17:25:18 -07:00 committed by Tom Rini
parent f1ece5d86e
commit 4b6070e056
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/net.c
View File

@ -314,7 +314,6 @@ static int parse_addr_size(char * const argv[])
* parse_args() - parse command line arguments
*
* Sets:
* - image_load_addr if a load address was provided
* - image_save_addr and image_save_size, if proto == TFTPPUT
*
* @proto: command prototype
@ -322,10 +321,12 @@ static int parse_addr_size(char * const argv[])
* parsed
* @argv: command line arguments, with argv[0] being the command
* @fnamep: set to the filename, if provided, else NULL
* @addrp: returns the load address, if any is provided, else it is left
* unchanged
* Return: 0 on success
*/
static int parse_args(enum proto_t proto, int argc, char *const argv[],
const char **fnamep)
const char **fnamep, ulong *addrp)
{
ulong addr;
char *end;
@ -348,7 +349,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[],
*/
addr = hextoul(argv[1], &end);
if (end == (argv[1] + strlen(argv[1])))
image_load_addr = addr;
*addrp = addr;
else
*fnamep = argv[1];
break;
@ -358,7 +359,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[],
if (parse_addr_size(argv))
return 1;
} else {
image_load_addr = hextoul(argv[1], NULL);
*addrp = hextoul(argv[1], NULL);
*fnamep = argv[2];
}
break;
@ -404,7 +405,7 @@ static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc,
}
}
if (parse_args(proto, argc, argv, &fname)) {
if (parse_args(proto, argc, argv, &fname, &image_load_addr)) {
bootstage_error(BOOTSTAGE_ID_NET_START);
return CMD_RET_USAGE;
}