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

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

[Stefan Roese]

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>
---
 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 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);
-- 
2.12.2

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

[Simon Glass]

On 31 March 2017 at 00:09, Stefan Roese <sr@denx.de> wrote:
> 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>
> ---
>  arch/x86/lib/bootm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

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

[Bin Meng]

On Fri, Mar 31, 2017 at 2:09 PM, Stefan Roese <sr@denx.de> wrote:
> 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>
> ---
>  arch/x86/lib/bootm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

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

[Bin Meng]

On Wed, Apr 5, 2017 at 10:38 AM, Bin Meng <bmeng.cn@gmail.com> wrote:
> On Fri, Mar 31, 2017 at 2:09 PM, Stefan Roese <sr@denx.de> wrote:
>> 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>
>> ---
>>  arch/x86/lib/bootm.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

applied to u-boot-x86, thanks!