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

pxe_utils: Simplify default fdt in label_run_boot()

Browse Source 
Tidy up this code a little to avoid two calls to env_get() for both
fdt_addr and fdtcontroladdr

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Quentin Schulz <quentin.schulz@cherry.de>
This commit is contained in:
Simon Glass
2025-03-18 13:12:15 -06:00
committed by Tom Rini
parent b13408021d
commit feb8d7fd74
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot/pxe_utils.c
+4 -10
View File
@@ -612,24 +612,18 @@ static int label_run_boot(struct pxe_context *ctx, struct pxe_label *label,
}
if (!bmi.conf_fdt) {
if (IS_ENABLED(CONFIG_SUPPORT_PASSING_ATAGS)) {
if (strcmp("-", label->fdt))
bmi.conf_fdt = env_get("fdt_addr");
} else {
if (!IS_ENABLED(CONFIG_SUPPORT_PASSING_ATAGS) ||
strcmp("-", label->fdt))
bmi.conf_fdt = env_get("fdt_addr");
}
}
kernel_addr_r = genimg_get_kernel_addr(kernel_addr);
buf = map_sysmem(kernel_addr_r, 0);
if (!bmi.conf_fdt && genimg_get_format(buf) != IMAGE_FORMAT_FIT) {
if (IS_ENABLED(CONFIG_SUPPORT_PASSING_ATAGS)) {
if (strcmp("-", label->fdt))
bmi.conf_fdt = env_get("fdtcontroladdr");
} else {
if (!IS_ENABLED(CONFIG_SUPPORT_PASSING_ATAGS) ||
strcmp("-", label->fdt))
bmi.conf_fdt = env_get("fdtcontroladdr");
}
}
/* Try bootm for legacy and FIT format image */