diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-07 23:13:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-07 23:13:35 -0400 |
| commit | db857dcbbfe993c21781524e44404f9800db87c7 (patch) | |
| tree | 6f94410d22fa9bffc0c44feb11241ef8e012edfd /common/image-fit.c | |
| parent | 7127151d538d878bd073ca6d6cca630a4b35b76f (diff) | |
| parent | 0b6febfdb3cf9b4a51fa65fbd94f9ab2d7738f32 (diff) | |
Merge branch '2019-08-07-master-imports'
- Misc Android / AVB bugfixes (including updating the header from
Android).
- MediaTek updates
- Other assorted bugfixes.
Diffstat (limited to 'common/image-fit.c')
| -rw-r--r-- | common/image-fit.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/common/image-fit.c b/common/image-fit.c index e346fed550..5c63c769de 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1998,10 +1998,11 @@ int fit_image_load(bootm_headers_t *images, ulong addr, comp = IH_COMP_NONE; loadbuf = buf; /* Kernel images get decompressed later in bootm_load_os(). */ - if (!(image_type == IH_TYPE_KERNEL || - image_type == IH_TYPE_KERNEL_NOLOAD) && - !fit_image_get_comp(fit, noffset, &comp) && - comp != IH_COMP_NONE) { + if (!fit_image_get_comp(fit, noffset, &comp) && + comp != IH_COMP_NONE && + !(image_type == IH_TYPE_KERNEL || + image_type == IH_TYPE_KERNEL_NOLOAD || + image_type == IH_TYPE_RAMDISK)) { ulong max_decomp_len = len * 20; if (load == data) { loadbuf = malloc(max_decomp_len); @@ -2021,6 +2022,10 @@ int fit_image_load(bootm_headers_t *images, ulong addr, memcpy(loadbuf, buf, len); } + if (image_type == IH_TYPE_RAMDISK && comp != IH_COMP_NONE) + puts("WARNING: 'compression' nodes for ramdisks are deprecated," + " please fix your .its file!\n"); + /* verify that image data is a proper FDT blob */ if (image_type == IH_TYPE_FLATDT && fdt_check_header(loadbuf)) { puts("Subimage data is not a FDT"); |