summaryrefslogtreecommitdiff
path: root/common/image.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-11-19 11:25:36 -0500
committerTom Rini <trini@konsulko.com>2015-11-19 11:25:36 -0500
commitaa7077fcee6cf00cde59bb9709ebd6205720f8bf (patch)
tree067a13ac5342287fbbc1429425b2e87f9f28106b /common/image.c
parent4c60850792e003bcafd16c324237a19307763829 (diff)
parentbdaeb8f23c6d5d11829072baaf0c0fe37c09f26a (diff)
downloadu-boot-imx-aa7077fcee6cf00cde59bb9709ebd6205720f8bf.zip
u-boot-imx-aa7077fcee6cf00cde59bb9709ebd6205720f8bf.tar.gz
u-boot-imx-aa7077fcee6cf00cde59bb9709ebd6205720f8bf.tar.bz2
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'common/image.c')
-rw-r--r--common/image.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/image.c b/common/image.c
index 85c4f39..c36927f 100644
--- a/common/image.c
+++ b/common/image.c
@@ -158,6 +158,7 @@ static const table_entry_t uimage_type[] = {
{ IH_TYPE_RKIMAGE, "rkimage", "Rockchip Boot Image" },
{ IH_TYPE_RKSD, "rksd", "Rockchip SD Boot Image" },
{ IH_TYPE_RKSPI, "rkspi", "Rockchip SPI Boot Image" },
+ { IH_TYPE_ZYNQIMAGE, "zynqimage", "Xilinx Zynq Boot Image" },
{ -1, "", "", },
};