diff options
| author | Heiko Schocher <hs@denx.de> | 2014-05-28 11:33:33 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-05 14:44:56 -0400 |
| commit | 21d29f7f9f4888a4858b58b368ae7cf8783a6ebf (patch) | |
| tree | b6a50204d2e1af557756d43adbb54a60ca8ff78f /common/cmd_ximg.c | |
| parent | 5f65826b1bbe155d839db7c92dca4653f0dcf025 (diff) | |
| download | talos-obmc-uboot-21d29f7f9f4888a4858b58b368ae7cf8783a6ebf.tar.gz talos-obmc-uboot-21d29f7f9f4888a4858b58b368ae7cf8783a6ebf.zip | |
bootm: make use of legacy image format configurable
make the use of legacy image format configurable through
the config define CONFIG_IMAGE_FORMAT_LEGACY.
When relying on signed FIT images with required signature check
the legacy image format should be disabled. Therefore introduce
this new define and enable legacy image format if CONFIG_FIT_SIGNATURE
is not set. If CONFIG_FIT_SIGNATURE is set disable per default
the legacy image format.
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Lars Steubesand <lars.steubesand@philips.com>
Cc: Mike Pearce <mike@kaew.be>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Tom Rini <trini@ti.com>
Cc: Michal Simek <monstr@monstr.eu>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cmd_ximg.c')
| -rw-r--r-- | common/cmd_ximg.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c index 65a8319662..ae2714d372 100644 --- a/common/cmd_ximg.c +++ b/common/cmd_ximg.c @@ -32,10 +32,13 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) { ulong addr = load_addr; ulong dest = 0; - ulong data, len, count; + ulong data, len; int verify; int part = 0; +#if defined(CONFIG_IMAGE_FORMAT_LEGACY) + ulong count; image_header_t *hdr = NULL; +#endif #if defined(CONFIG_FIT) const char *uname = NULL; const void* fit_hdr; @@ -64,6 +67,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) } switch (genimg_get_format((void *)addr)) { +#if defined(CONFIG_IMAGE_FORMAT_LEGACY) case IMAGE_FORMAT_LEGACY: printf("## Copying part %d from legacy image " @@ -114,6 +118,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) image_multi_getimg(hdr, part, &data, &len); break; +#endif #if defined(CONFIG_FIT) case IMAGE_FORMAT_FIT: if (uname == NULL) { @@ -211,7 +216,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) } break; #endif -#if defined(CONFIG_BZIP2) +#if defined(CONFIG_BZIP2) && defined(CONFIG_IMAGE_FORMAT_LEGACY) case IH_COMP_BZIP2: { int i; |
