diff options
| -rw-r--r-- | boot/bootm.c | 3 | ||||
| -rw-r--r-- | boot/image-board.c | 5 | ||||
| -rw-r--r-- | include/image.h | 9 |
3 files changed, 10 insertions, 7 deletions
diff --git a/boot/bootm.c b/boot/bootm.c index 5dc9cdeb244..ae3fceb392d 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -555,8 +555,7 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start, #if CONFIG_IS_ENABLED(FIT) if (IS_ENABLED(CONFIG_FPGA)) { /* find bitstreams */ - ret = boot_get_fpga(argc, argv, &images, IH_ARCH_DEFAULT, - NULL, NULL); + ret = boot_get_fpga(&images); if (ret) { printf("FPGA image is corrupted or invalid\n"); return 1; diff --git a/boot/image-board.c b/boot/image-board.c index 60e514fc150..b926275ec91 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -616,8 +616,7 @@ int boot_get_setup(struct bootm_headers *images, u8 arch, return boot_get_setup_fit(images, arch, setup_start, setup_len); } -int boot_get_fpga(int argc, char *const argv[], struct bootm_headers *images, - u8 arch, const ulong *ld_start, ulong * const ld_len) +int boot_get_fpga(struct bootm_headers *images) { ulong tmp_img_addr, img_data, img_len; void *buf; @@ -659,7 +658,7 @@ int boot_get_fpga(int argc, char *const argv[], struct bootm_headers *images, tmp_img_addr, (const char **)&uname, &images->fit_uname_cfg, - arch, + IH_ARCH_DEFAULT, IH_TYPE_FPGA, BOOTSTAGE_ID_FPGA_INIT, FIT_LOAD_OPTIONAL_NON_ZERO, diff --git a/include/image.h b/include/image.h index 04f35de9d08..63f2bd3b371 100644 --- a/include/image.h +++ b/include/image.h @@ -642,8 +642,13 @@ ulong genimg_get_kernel_addr(char * const img_addr); int genimg_get_format(const void *img_addr); int genimg_has_config(struct bootm_headers *images); -int boot_get_fpga(int argc, char *const argv[], struct bootm_headers *images, - uint8_t arch, const ulong *ld_start, ulong * const ld_len); +/** + * boot_get_fpga() - Locate the FPGA image + * + * @images: Information about images being loaded + * Return 0 if OK, non-zero on failure + */ +int boot_get_fpga(struct bootm_headers *images); /** * boot_get_ramdisk() - Locate the ramdisk |