aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2017-11-23 18:59:45 +0100
committerBin Meng <bmeng.cn@gmail.com>2017-11-30 13:50:17 +0800
commit254752494ae90eba7f8cd047676ff5caf8d9d0ef (patch)
treee09a113ecf82b58ab8a4cd4181ad3de73cbed218
parent39670c341f0598dd00e5124deb5b479bf674b949 (diff)
downloadu-boot-254752494ae90eba7f8cd047676ff5caf8d9d0ef.zip
u-boot-254752494ae90eba7f8cd047676ff5caf8d9d0ef.tar.gz
u-boot-254752494ae90eba7f8cd047676ff5caf8d9d0ef.tar.bz2
Revert "x86: bootm: Fix FIT image booting on x86"
This reverts commit 13c531e52a09b4e6ffa8b5a1457199b0a574cb27. The error message with FIT style image mentioned in the above commit only happens when booting using FIT image containing bzImage kernel and without setup node (setup.bin). The current documentation for x86 FIT support in doc/uImage.FIT/x86-fit-boot.txt mentions that kernel's setup.bin file is required for building x86 FIT images. The above commit breaks FIT images generated as described in the documentation. Revert it to allow booting with images built in the documented way. Signed-off-by: Anatolij Gustschin <agust@denx.de> Reviewed-by: Stefan Roese <sr@denx.de> Acked-by: Bin Meng <bmeng.cn@gmail.com>
-rw-r--r--arch/x86/lib/bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index ecd4f4e..e548cdb 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -109,7 +109,7 @@ static int boot_prep_linux(bootm_headers_t *images)
}
is_zimage = 1;
#if defined(CONFIG_FIT)
- } else if (images->fit_uname_os) {
+ } else if (images->fit_uname_os && is_zimage) {
ret = fit_image_get_data(images->fit_hdr_os,
images->fit_noffset_os,
(const void **)&data, &len);