spl: fit: Fix support for loading FPGA bitstream
PATCH v2 1/1 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 <[email protected]>
Cc Tom Rini <[email protected]>
---
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(-)
common/spl/spl_fit.c +8 -5
@@ -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))
Signature · 1 line
2.16.2
PATCH v2 1/1 spl: fit: Fix support for loading FPGA bitstream
Quoted 7 lines · Marek Vasut
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 <[email protected]>Cc Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180711/a35f1229/attachment.sig>