diff options
| author | Marek Vasut <marex@denx.de> | 2018-06-01 23:19:29 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-10 16:55:57 -0400 |
| commit | 56419ea5f0800690b47390baee580e541342d35c (patch) | |
| tree | 0e8496b758a2dc16c5cc80fb5ae859236d9760bf /common/spl | |
| parent | 26ad648ff4fcca2f5676a0690902be54a94f243d (diff) | |
spl: fit: Fix support for loading FPGA bitstream
Move the FPGA loading from IS_ENABLED(CONFIG_SPL_OS_BOOT) &&
IS_ENABLED(CONFIG_SPL_GZIP) conditional. The FPGA loading can
be used without OS loading and GZIP support in SPL. This issue
was most likely induced by some merge conflict, so fix it.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl_fit.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 2321ebb0dd..e01b4e578d 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -185,16 +185,19 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector, int ret; #endif + if (IS_ENABLED(CONFIG_SPL_FPGA_SUPPORT) || + (IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP))) { + if (fit_image_get_type(fit, node, &type)) + puts("Cannot get image type.\n"); + else + 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 (fit_image_get_type(fit, node, &type)) - puts("Cannot get image type.\n"); - else - debug("%s ", genimg_get_type_name(type)); } if (fit_image_get_load(fit, node, &load_addr)) |