diff options
author | Tom Rini <trini@konsulko.com> | 2017-12-18 12:23:27 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-12-18 12:23:27 -0500 |
commit | 90d75d2efc376094b50d84de80e9cb8b3bcae032 (patch) | |
tree | a5bcce535313c824bca832b9b9ccbc7f870d35fa /drivers/fpga/fpga.c | |
parent | a9e670d46f1916d6fb925244d5d4c9a48db8e26b (diff) | |
parent | 3e229a83bd4190f99731992d3a56983f29313899 (diff) |
Merge tag 'xilinx-for-v2018.01-rc2-v2' of git://www.denx.de/git/u-boot-microblaze
Xilinx changes for v2018.01-rc2-v2
fpga:
- Enable loading bitstream via fit image for !xilinx platforms
zynq:
- Fix SPL SD boot mode
zynqmp:
- Not not reset in panic
- Do not use simple allocator because of fat changes
- Various dt chagnes
- modeboot variable setup
- Fix fpga loading on automotive devices
- Fix coverity issues
test:
- Fix env test for !hush case - Stephen's patch
Diffstat (limited to 'drivers/fpga/fpga.c')
-rw-r--r-- | drivers/fpga/fpga.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c index e0fb1b4e783..6aead27f162 100644 --- a/drivers/fpga/fpga.c +++ b/drivers/fpga/fpga.c @@ -171,6 +171,15 @@ int fpga_add(fpga_type devtype, void *desc) } /* + * Return 1 if the fpga data is partial. + * This is only required for fpga drivers that support bitstream_type. + */ +int __weak fpga_is_partial_data(int devnum, size_t img_len) +{ + return 0; +} + +/* * Convert bitstream data and load into the fpga */ int __weak fpga_loadbitstream(int devnum, char *fpgadata, size_t size, |