diff options
author | Tom Rini <trini@konsulko.com> | 2016-05-24 08:20:43 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-05-24 08:20:43 -0400 |
commit | ec8fb48ce98987065493b27422200897cf0909f8 (patch) | |
tree | e56d70ee24a04ee26fe75ac2af46c22705da61ed /include/image.h | |
parent | c98dc5a13399414fb651a80d05fa682236c4444e (diff) | |
parent | ad5b5801264e573bfbf17a20b04c546985c5bfc1 (diff) | |
download | u-boot-imx-ec8fb48ce98987065493b27422200897cf0909f8.zip u-boot-imx-ec8fb48ce98987065493b27422200897cf0909f8.tar.gz u-boot-imx-ec8fb48ce98987065493b27422200897cf0909f8.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'include/image.h')
-rw-r--r-- | include/image.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/image.h b/include/image.h index f9ee564..a8f6bd1 100644 --- a/include/image.h +++ b/include/image.h @@ -246,8 +246,10 @@ struct lmb; #define IH_TYPE_RKSD 24 /* Rockchip SD card */ #define IH_TYPE_RKSPI 25 /* Rockchip SPI image */ #define IH_TYPE_ZYNQIMAGE 26 /* Xilinx Zynq Boot Image */ +#define IH_TYPE_ZYNQMPIMAGE 27 /* Xilinx ZynqMP Boot Image */ +#define IH_TYPE_FPGA 28 /* FPGA Image */ -#define IH_TYPE_COUNT 27 /* Number of image types */ +#define IH_TYPE_COUNT 29 /* Number of image types */ /* * Compression Types @@ -494,6 +496,8 @@ int genimg_get_format(const void *img_addr); int genimg_has_config(bootm_headers_t *images); ulong genimg_get_image(ulong img_addr); +int boot_get_fpga(int argc, char * const argv[], bootm_headers_t *images, + uint8_t arch, const ulong *ld_start, ulong * const ld_len); int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, uint8_t arch, ulong *rd_start, ulong *rd_end); @@ -809,6 +813,7 @@ int bootz_setup(ulong image, ulong *start, ulong *end); #define FIT_LOADABLE_PROP "loadables" #define FIT_DEFAULT_PROP "default" #define FIT_SETUP_PROP "setup" +#define FIT_FPGA_PROP "fpga" #define FIT_MAX_HASH_LEN HASH_MAX_DIGEST_SIZE |