When patch [1] introduced "fdtcontroladdr" fallback in order to use built-in DT when no DT in provided in PXE config, it broke FIT image boot where the DT from the FIT configuration was used.

This disables the "fdtcontroladdr" fallback when the provided image is from the FIT image type.

[1] d5ba6188dfbf ("cmd: pxe_utils: Check fdtcontroladdr in label_boot")

Fixes: d5ba6188dfbf ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") Cc: Tom Rini trini@konsulko.com Cc: Peter Hoyes peter.hoyes@arm.com Signed-off-by: Neil Armstrong narmstrong@baylibre.com --- boot/pxe_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index b08aee9896..5eb328c86b 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -725,7 +725,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = env_get("fdt_addr");

- if (!bootm_argv[3]) + if (genimg_get_format(buf) != IMAGE_FORMAT_FIT && !bootm_argv[3]) bootm_argv[3] = env_get("fdtcontroladdr");

if (bootm_argv[3]) {