[U-Boot] [PATCH] Revert "x86: bootm: Fix FIT image booting on x86"

[Stefan Roese]

On 23.11.2017 18:59, Anatolij Gustschin wrote:
> 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 at denx.de>
> ---
>   arch/x86/lib/bootm.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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);
> 

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan