| Message ID | 20180601211929.30645-1-marex@denx.de |
|---|---|
| State | Accepted |
| Commit | 56419ea5f0800690b47390baee580e541342d35c |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,V2] spl: fit: Fix support for loading FPGA bitstream | expand |
On Fri, Jun 01, 2018 at 11:19:29PM +0200, Marek Vasut wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 2821a3e268..0cd7f7b076 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))
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> --- V2: Wrap the FPGA loading into a conditional to prevent platforms from going oversize --- common/spl/spl_fit.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)