The implementation of boot_get_fpga only supported one fpga family.
This modification allows for any of the fpga devices supported by
fpga_load to be used.
Signed-off-by: Dalon Westergreen <dwest...@gmail.com>
---
common/image.c | 37 ++++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/common/image.c b/common/image.c
index 0f88984..792d371 100644
--- a/common/image.c
+++ b/common/image.c
@@ -1306,7 +1306,7 @@ int boot_get_setup(bootm_headers_t *images, uint8_t arch,
}
#if IMAGE_ENABLE_FIT
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_XILINX)
+#if defined(CONFIG_FPGA)
int boot_get_fpga(int argc, char * const argv[], bootm_headers_t *images,
uint8_t arch, const ulong *ld_start, ulong * const ld_len)
{
@@ -1318,7 +1318,8 @@ int boot_get_fpga(int argc, char * const argv[],
bootm_headers_t *images,
int err;
int devnum = 0; /* TODO support multi fpga platforms */
const fpga_desc * const desc = fpga_get_desc(devnum);
- xilinx_desc *desc_xilinx = desc->devdesc;
+ xilinx_desc *desc_xilinx;
+ bitstream_type bstype;
/* Check to see if the images struct has a FIT configuration */
if (!genimg_has_config(images)) {
@@ -1365,22 +1366,28 @@ int boot_get_fpga(int argc, char * const argv[],
bootm_headers_t *images,
return fit_img_result;
}
- if (img_len >= desc_xilinx->size) {
+ switch (desc->devtype) {
+ case fpga_xilinx:
+ desc_xilinx = desc->devdesc;
+ if (img_len >= desc_xilinx->size) {
+ name = "full";
+ bstype = BIT_FULL;
+ } else {
+ name = "partial";
+ bstype = BIT_PARTIAL;
+ }
+ break;
+ default:
name = "full";
- err = fpga_loadbitstream(devnum, (char *)img_data,
- img_len, BIT_FULL);
- if (err)
- err = fpga_load(devnum, (const void *)img_data,
- img_len, BIT_FULL);
- } else {
- name = "partial";
- err = fpga_loadbitstream(devnum, (char *)img_data,
- img_len, BIT_PARTIAL);
- if (err)
- err = fpga_load(devnum, (const void *)img_data,
- img_len, BIT_PARTIAL);
+ bstype = BIT_FULL;
}
+ err = fpga_loadbitstream(devnum, (char *)img_data,
+ img_len, bstype);
+ if (err)
+ err = fpga_load(devnum, (const void *)img_data,
+ img_len, bstype);
+
if (err)
return err;
--
2.7.4
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
