diff options
| author | Tom Rini <[email protected]> | 2020-01-23 16:28:17 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-01-23 16:28:17 -0500 |
| commit | 2c871f9e084b2c03d1961884228a6901387ab8d6 (patch) | |
| tree | 3d5adbb8b209dc38b11c0b12ff47e0ec37633a7d /common/spl | |
| parent | 052170c6a043eec4e73fad80955876cf1ba5e4f2 (diff) | |
| parent | a9d1c0e2bc3fced595b742d90e65c744c55616b3 (diff) | |
Merge branch '2020-01-22-master-imports'
- Re-add U8500 platform support
- Add bcm968360bg support
- Assorted Keymile fixes
- Other assorted bugfixes
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl_fit.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index ac69d8312ee..aef1dbdd49a 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)) |
