diff options
author | Tom Rini <trini@konsulko.com> | 2017-11-30 10:37:43 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-11-30 10:37:43 -0500 |
commit | 6ea51d286093aa21619cc2a55263caf1e9d5f340 (patch) | |
tree | 3f9bc9a21a1351de300f73ea5b9706e3053ef955 /arch/x86/lib/bootm.c | |
parent | 34dd853ce5f44d34bfb0358c73da2fe9f2a4e5d1 (diff) | |
parent | aa7839b39c2ee77f9ab8c393c56b8d812507dbb7 (diff) |
Merge git://git.denx.de/u-boot-x86
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 ecd4f4e6c6..e548cdbed5 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); |