GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-18 13:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pxe: prepend fdtdir to DTB name irrespective of source

Browse source 
The directory name from an fdtdir directive in a PXE config file should
always be pre-pended to the DTB filename; it shouldn't matter whether
the DTB filename came from the $fdtfile environment variable, or whether
it was constructed dynamically from ${soc}-${board}.dtb. Fix the code to
always prepend the directory name.

Reported-by: Dennis Gilmore <dennis@ausil.us>
Fixes: c61d94d860 ("pxe: implement fdtdir extlinux.conf tag")
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Dennis Gilmore <dennis@ausil.us>
Tested-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Stephen Warren 2014-02-12 14:30:04 -07:00 • committed by Tom Rini
parent 102c051fcc
commit e22361af07
1 changed files with 39 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
common/cmd_pxe.c
View file

@ -700,44 +700,47 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label)
if (label->fdt) {
fdtfile = label->fdt;
} else if (label->fdtdir) {
fdtfile = getenv("fdtfile");
/*
* For complex cases, it might be worth calling a
* board- or SoC-provided function here to provide a
* better default:
*
* if (!fdtfile)
* fdtfile = gen_fdtfile();
*
* If this is added, be sure to keep the default below,
* or move it to the default weak implementation of
* gen_fdtfile().
*/
if (!fdtfile) {
char *soc = getenv("soc");
char *board = getenv("board");
char *slash;
char *f1, *f2, *f3, *f4, *slash;
len = strlen(label->fdtdir);
if (!len)
slash = "./";
else if (label->fdtdir[len - 1] != '/')
slash = "/";
else
slash = "";
len = strlen(label->fdtdir) + strlen(slash) +
strlen(soc) + 1 + strlen(board) + 5;
fdtfilefree = malloc(len);
if (!fdtfilefree) {
printf("malloc fail (FDT filename)\n");
return 1;
}
snprintf(fdtfilefree, len, "%s%s%s-%s.dtb",
label->fdtdir, slash, soc, board);
fdtfile = fdtfilefree;
f1 = getenv("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 = getenv("soc");
f2 = "-";
f3 = getenv("board");
f4 = ".dtb";
}
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");
return 1;
}
snprintf(fdtfilefree, len, "%s%s%s%s%s%s",
label->fdtdir, slash, f1, f2, f3, f4);
fdtfile = fdtfilefree;
}
if (fdtfile) {