summaryrefslogtreecommitdiff
path: root/common/bootm.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-05-24 08:20:43 -0400
committerTom Rini <trini@konsulko.com>2016-05-24 08:20:43 -0400
commitec8fb48ce98987065493b27422200897cf0909f8 (patch)
treee56d70ee24a04ee26fe75ac2af46c22705da61ed /common/bootm.c
parentc98dc5a13399414fb651a80d05fa682236c4444e (diff)
parentad5b5801264e573bfbf17a20b04c546985c5bfc1 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'common/bootm.c')
-rw-r--r--common/bootm.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/common/bootm.c b/common/bootm.c
index c965326db41..49414142dcd 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -246,6 +246,16 @@ int bootm_find_images(int flag, int argc, char * const argv[])
#endif
#if IMAGE_ENABLE_FIT
+#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_XILINX)
+ /* find bitstreams */
+ ret = boot_get_fpga(argc, argv, &images, IH_ARCH_DEFAULT,
+ NULL, NULL);
+ if (ret) {
+ printf("FPGA image is corrupted or invalid\n");
+ return 1;
+ }
+#endif
+
/* find all of the loadables */
ret = boot_get_loadable(argc, argv, &images, IH_ARCH_DEFAULT,
NULL, NULL);