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 /common | |
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 'common')
-rw-r--r-- | common/bootm.c | 2 | ||||
-rw-r--r-- | common/image.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/common/bootm.c b/common/bootm.c index 9493a306cd0..adb12137c7b 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -248,7 +248,7 @@ int bootm_find_images(int flag, int argc, char * const argv[]) #endif #if IMAGE_ENABLE_FIT -#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_XILINX) +#if defined(CONFIG_FPGA) /* find bitstreams */ ret = boot_get_fpga(argc, argv, &images, IH_ARCH_DEFAULT, NULL, NULL); diff --git a/common/image.c b/common/image.c index 4bcf6b3128a..96c5f58e4c6 100644 --- a/common/image.c +++ b/common/image.c @@ -1215,7 +1215,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) { @@ -1226,8 +1226,6 @@ int boot_get_fpga(int argc, char * const argv[], bootm_headers_t *images, const char *uname, *name; 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; /* Check to see if the images struct has a FIT configuration */ if (!genimg_has_config(images)) { @@ -1272,7 +1270,7 @@ int boot_get_fpga(int argc, char * const argv[], bootm_headers_t *images, return fit_img_result; } - if (img_len >= desc_xilinx->size) { + if (!fpga_is_partial_data(devnum, img_len)) { name = "full"; err = fpga_loadbitstream(devnum, (char *)img_data, img_len, BIT_FULL); |