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

pxe: Move common parsing coding into pxe_util

Browse Source 
Both the syslinux and pxe commands use essentially the same code to parse
and run extlinux.conf files. Move this into a common function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Artem Lapkin <email2tema@gmail.com>
Tested-by: Artem Lapkin <email2tema@gmail.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
This commit is contained in:
Simon Glass
2021-10-14 12:48:03 -06:00
committed by Tom Rini
parent 929860bfbb
commit 9e62e7ca54
4 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/sysboot.c
View File

@@ -60,10 +60,10 @@ static int do_sysboot(struct cmd_tbl *cmdtp, int flag, int argc,
{
unsigned long pxefile_addr_r;
struct pxe_context ctx;
struct pxe_menu *cfg;
char *pxefile_addr_str;
char *filename;
int prompt = 0;
int ret;
if (argc > 1 && strstr(argv[1], "-p")) {
prompt = 1;
@@ -113,19 +113,9 @@ static int do_sysboot(struct cmd_tbl *cmdtp, int flag, int argc,
return 1;
}
cfg = parse_pxefile(&ctx, pxefile_addr_r);
if (!cfg) {
printf("Error parsing config file\n");
return 1;
}
if (prompt)
cfg->prompt = 1;
handle_pxe_menu(&ctx, cfg);
destroy_pxe_menu(cfg);
ret = pxe_process(&ctx, pxefile_addr_r, prompt);
if (ret)
return CMD_RET_FAILURE;
return 0;
}