mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-12-03 17:43:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

pxe: Move calculation of FDT file into a function

Browse Source 
This code undertakes a separate task from the main logic of
label_run_boot() so move it into its own function.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-12-14 21:19:11 -07:00 committed by Tom Rini
parent 03a4a6d5bc
commit 8ed730f720
1 changed files with 64 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
boot/pxe_utils.c
View File

@ -469,6 +469,68 @@ skip_overlay:
}
#endif
/**
* calc_fdt_fname() - Figure out the filename to use for the FDT
*
* Determine the path to the FDT filename, based on the "fdtfile" environment
* variable. Use <soc>-<board>.dtb as a fallback
*
* @fdtdir: Directory to use for the FDT file
* Return: allocated filename (including directory), or NULL if out of memory
*/
static char *calc_fdt_fname(const char *fdtdir)
{
char *fdtfile;
char *f1, *f2, *f3, *f4, *slash;
int len;
f1 = env_get("fdtfile");
if (f1) {
f2 = "";
f3 = "";
f4 = "";
} else {
/*
* For complex cases where this code doesn't generate the
* correct filename, the board code should set $fdtfile during
* early boot, or the boot scripts should set $fdtfile before
* invoking "pxe" or "sysboot".
*/
f1 = env_get("soc");
f2 = "-";
f3 = env_get("board");
f4 = ".dtb";
if (!f1) {
f1 = "";
f2 = "";
}
if (!f3) {
f2 = "";
f3 = "";
}
}
len = strlen(fdtdir);
if (!len)
slash = "./";
else if (fdtdir[len - 1] != '/')
slash = "/";
else
slash = "";
len = strlen(fdtdir) + strlen(slash) + strlen(f1) + strlen(f2) +
strlen(f3) + strlen(f4) + 1;
fdtfile = malloc(len);
if (!fdtfile) {
printf("malloc fail (FDT filename)\n");
return NULL;
}
snprintf(fdtfile, len, "%s%s%s%s%s%s", fdtdir, slash, f1, f2, f3, f4);
return fdtfile;
}
/**
* label_run_boot() - Run the correct boot procedure
*
@ -525,55 +587,9 @@ static int label_run_boot(struct pxe_context *ctx, struct pxe_label *label,
if (label->fdt) {
fdtfile = label->fdt;
} else if (label->fdtdir) {
char *f1, *f2, *f3, *f4, *slash;
int len;
f1 = env_get("fdtfile");
if (f1) {
f2 = "";
f3 = "";
f4 = "";
} else {
/*
* For complex cases where this code doesn't
* generate the correct filename, the board
* code should set $fdtfile during early boot,
* or the boot scripts should set $fdtfile
* before invoking "pxe" or "sysboot".
*/
f1 = env_get("soc");
f2 = "-";
f3 = env_get("board");
f4 = ".dtb";
if (!f1) {
f1 = "";
f2 = "";
}
if (!f3) {
f2 = "";
f3 = "";
}
}
len = strlen(label->fdtdir);
if (!len)
slash = "./";
else if (label->fdtdir[len - 1] != '/')
slash = "/";
else
slash = "";
len = strlen(label->fdtdir) + strlen(slash) +
strlen(f1) + strlen(f2) + strlen(f3) +
strlen(f4) + 1;
fdtfilefree = malloc(len);
if (!fdtfilefree) {
printf("malloc fail (FDT filename)\n");
fdtfilefree = calc_fdt_fname(label->fdtdir);
if (!fdtfilefree)
return -ENOMEM;
}
snprintf(fdtfilefree, len, "%s%s%s%s%s%s",
label->fdtdir, slash, f1, f2, f3, f4);
fdtfile = fdtfilefree;
}