diff options
| author | Neil Armstrong <narmstrong@baylibre.com> | 2022-05-27 16:37:25 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-03 10:23:22 -0400 |
| commit | f68087a465d5c2fa61fa4b6c6f0980fc157fb547 (patch) | |
| tree | a2111cf691c85b887361e6c65712fcb25a4d63af | |
| parent | 339f652992919be11e3f1b791515140de646a3ef (diff) | |
| download | u-boot-f68087a465d5c2fa61fa4b6c6f0980fc157fb547.zip u-boot-f68087a465d5c2fa61fa4b6c6f0980fc157fb547.tar.gz u-boot-f68087a465d5c2fa61fa4b6c6f0980fc157fb547.tar.bz2 | |
boot: pxe_utils: Do not use fdtcontroladdr for FIT Image format
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>
| -rw-r--r-- | boot/pxe_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index b08aee9..5eb328c 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]) { |