diff options
| author | Stefan Roese <sr@denx.de> | 2017-03-31 09:09:39 +0300 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2017-04-10 05:02:03 +0300 |
| commit | 13c531e52a09b4e6ffa8b5a1457199b0a574cb27 (patch) | |
| tree | 35069f67381b293985c19ef4224e1c81c970ed55 /arch/x86/lib/bootm.c | |
| parent | 2b4c65289698705d91e4c601ece3f079c71cf433 (diff) | |
| download | u-boot-13c531e52a09b4e6ffa8b5a1457199b0a574cb27.tar.xz | |
x86: bootm: Fix FIT image booting on x86
Checking 'is_zimage' at this time will always fail and therefore booting
a FIT style image will always lead to this error message:
"## Kernel loading failed (missing x86 kernel setup) ..."
This change now removes this check and booting of FIT images works just
fine.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch/x86/lib/bootm.c')
| -rw-r--r-- | arch/x86/lib/bootm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 3c3d9e1e80..75bab90225 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -100,7 +100,7 @@ static int boot_prep_linux(bootm_headers_t *images) } is_zimage = 1; #if defined(CONFIG_FIT) - } else if (images->fit_uname_os && is_zimage) { + } else if (images->fit_uname_os) { ret = fit_image_get_data(images->fit_hdr_os, images->fit_noffset_os, (const void **)&data, &len); |