[PATCH] spl_fit.c: enable loading compressed u-boot from fit image

Simon Glass sjg at chromium.org
Mon Dec 30 02:21:25 CET 2019


Hi Rasmus,

On Wed, 11 Dec 2019 at 04:03, Rasmus Villemoes
<rasmus.villemoes at prevas.dk> wrote:
>
> From: "Klaus H. Sorensen" <khso at prevas.dk>
>
> Allow reading compressed content from fit image, even if
> CONFIG_SPL_OS_BOOT is not set.
>
> This allow booting compressed 2nd stage u-boot from fit image.
>
> Additionally, do not print warning message if compression node is not
> found, since it simply implies the content is uncompressed.
>
> Signed-off-by: Klaus H. Sorensen <khso at prevas.dk>
> Signed-off-by: Rasmus Villemoes <rasmus.villemoes at prevas.dk>
> ---
>  common/spl/spl_fit.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
> index b3e3ccd5a2..98271eb878 100644
> --- a/common/spl/spl_fit.c
> +++ b/common/spl/spl_fit.c
> @@ -195,11 +195,9 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
>                         debug("%s ", genimg_get_type_name(type));
>         }
>
> -       if (IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP)) {
> -               if (fit_image_get_comp(fit, node, &image_comp))
> -                       puts("Cannot get image compression format.\n");

You dropped this error, which seems necessary.

> -               else
> -                       debug("%s ", genimg_get_comp_name(image_comp));
> +       if (IS_ENABLED(CONFIG_SPL_GZIP)) {
> +               fit_image_get_comp(fit, node, &image_comp);
> +               debug("%s ", genimg_get_comp_name(image_comp));
>         }
>
>         if (fit_image_get_load(fit, node, &load_addr))
> --
> 2.23.0
>

Regards,
Simon


More information about the U-Boot mailing list