On Thu, Sep 11, 2025 at 3:35 PM Guillaume Ranquet <[email protected]> wrote: > > The else if branch uses the is_zimage boolean which is initialized to 0 > and never set before being tested here. > > remove the test on is_zimage to make this code reachable. > > Signed-off-by: Guillaume Ranquet <[email protected]> > --- > 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 > 0827a884b1d245ecb8a55d46105a1d67d0cdfb56..7a94dc877e31dc8c02131699b9318c35e4fcfe79 > 100644 > --- a/arch/x86/lib/bootm.c > +++ b/arch/x86/lib/bootm.c > @@ -103,7 +103,7 @@ static int boot_prep_linux(struct bootm_headers *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); > > --- > base-commit: c85b8071e7d3fd333f8a2fdd28083cb5ec3a0645 > change-id: 20250703-fix_fit_zimage-57bd629f5ab5 > > Best regards, > -- > Guillaume Ranquet <[email protected]> >
Hello. Seems this has gone a bit unnoticed. So let me try to add a bit of context on why I ended up sending this fix. I'm running Xen on x86 using fitImage with hyperlaunch (I can give details on what is hyperlaunch and how I'm using it, but this [1] should help already). So my fitImage has 2 configurations: * Xen with Linux as a loadable * Linux as a baremetal image (used for recovery/provisioning) Why am I using a bzImage as a linux loadable for Xen? Because this is the easiest thing to start with Xen (it might be possible to load a gzipped elf without the setup bit of the bzImage) but I haven't spent time looking into it and a bzImage is what my OEM is working with. So, in order to keep things simple, I want to also boot linux as a bzImage from a fit image in my recovery configuration. Hope this bit of context helps with the review. Thx, Guillaume. [1]: https://docs.u-boot.org/en/latest/usage/fit/multi-with-loadables.html
