summaryrefslogtreecommitdiff
path: root/boot/bootm.c
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2022-08-27 04:17:28 +0100
committerTom Rini <trini@konsulko.com>2022-08-31 12:21:47 -0400
commit88de6c512758f9705a14965ab97f11b463f3fa7c (patch)
treecd6ef86f0f9e10a0d50d58a02f8ff514e96eb91c /boot/bootm.c
parent0cd57f29e49a99135660a65d21da8e6b3d5cb52a (diff)
image-fit: don't set compression if it can't be read
fit_image_get_comp() should not set value -1 in case it can't read the compression node. Instead, leave the value untouched in that case as it can be absent and a default value previously defined by the caller of fit_image_get_comp() should be used. As a result the warning message WARNING: 'compression' nodes for ramdisks are deprecated, please fix your .its file! no longer shows if the compression node is actually absent. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'boot/bootm.c')
-rw-r--r--boot/bootm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/boot/bootm.c b/boot/bootm.c
index 63c79a9cfc..29c067fae7 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -1024,10 +1024,8 @@ static int bootm_host_load_image(const void *fit, int req_image_type,
return -EINVAL;
}
- if (fit_image_get_comp(fit, noffset, &image_comp)) {
- puts("Can't get image compression!\n");
- return -EINVAL;
- }
+ if (fit_image_get_comp(fit, noffset, &image_comp))
+ image_comp = IH_COMP_NONE;
/* Allow the image to expand by a factor of 4, should be safe */
buf_size = (1 << 20) + len * 4;