summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-01-22 09:48:22 -0500
committerTom Rini <trini@ti.com>2015-01-22 09:48:22 -0500
commit4608f37918e5d93d6b2b6909b325a5e6fb0a2346 (patch)
treec15a1821c12030e6e2d12c85c3e22fc1d3f1f79a /common
parentb56f6e2b4e0291efbe1b50f082dec73272ad7ab3 (diff)
parentb9103809eb9052f40479d2d741e980832b75ebba (diff)
downloadu-boot-imx-4608f37918e5d93d6b2b6909b325a5e6fb0a2346.zip
u-boot-imx-4608f37918e5d93d6b2b6909b325a5e6fb0a2346.tar.gz
u-boot-imx-4608f37918e5d93d6b2b6909b325a5e6fb0a2346.tar.bz2
Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'common')
-rw-r--r--common/cmd_fpga.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c
index 8c5bf44..484a6c6 100644
--- a/common/cmd_fpga.c
+++ b/common/cmd_fpga.c
@@ -211,6 +211,7 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
comp = image_get_comp(hdr);
if (comp == IH_COMP_GZIP) {
+#if defined(CONFIG_GZIP)
ulong image_buf = image_get_data(hdr);
data = image_get_load(hdr);
ulong image_size = ~0UL;
@@ -222,6 +223,10 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
return 1;
}
data_size = image_size;
+#else
+ puts("Gunzip image is not supported\n");
+ return 1;
+#endif
} else {
data = (ulong)image_get_data(hdr);
data_size = image_get_data_size(hdr);