From 602ce1d10695d37f9a72b9cd23500b87050db588 Mon Sep 17 00:00:00 2001 From: "Klaus H. Sorensen" Date: Wed, 11 Dec 2019 11:03:33 +0000 Subject: [PATCH] spl_fit.c: enable loading compressed u-boot from fit image 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 Signed-off-by: Rasmus Villemoes --- 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 ac69d8312e..aef1dbdd49 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -259,11 +259,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"); - 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.25.1