zhao/bl-mt798x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uboot-mtk-20220606: image-fit: don't set compression if it can't be read

Browse Source 
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>
This commit is contained in:
Daniel Golle
2022-08-27 04:17:28 +01:00
committed by hanwckf
parent a4a6363b73
commit e137e075d5
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
uboot-mtk-20220606/boot/bootm.c
View File

@@ -1037,10 +1037,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 */
load_buf = malloc((1 << 20) + len * 4);

3
uboot-mtk-20220606/boot/image-fit.c
View File

@@ -486,7 +486,7 @@ void fit_print_contents(const void *fit)
void fit_image_print(const void *fit, int image_noffset, const char *p)
{
char *desc;
uint8_t type, arch, os, comp;
uint8_t type, arch, os, comp = IH_COMP_NONE;
size_t size;
ulong load, entry;
const void *data;
@@ -803,7 +803,6 @@ int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp)
data = fdt_getprop(fit, noffset, FIT_COMP_PROP, &len);
if (data == NULL) {
fit_get_debug(fit, noffset, FIT_COMP_PROP, len);
*comp = -1;
return -1;
}

7
uboot-mtk-20220606/cmd/ximg.c
View File

@@ -171,11 +171,8 @@ do_imgextract(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
return 1;
}
if (fit_image_get_comp(fit_hdr, noffset, &comp)) {
puts("Could not find script subimage "
"compression type\n");
return 1;
}
if (fit_image_get_comp(fit_hdr, noffset, &comp))
comp = IH_COMP_NONE;
data = (ulong)fit_data;
len = (ulong)fit_len;