diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-07-10 10:26:07 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-07-10 10:26:07 +0200 |
| commit | 794a5924972fc8073616e98a2668da4a5f9aea90 (patch) | |
| tree | dd0db39b3e183b5bcb0300d5377d7a0d5ac5fd0c /common/cmd_usb.c | |
| parent | f2aeecc320f5b181b30effcaa67683aec8d5a843 (diff) | |
| parent | 4188f0491886b3b486164e819c0a83fdb97efd7d (diff) | |
| download | blackbird-obmc-uboot-794a5924972fc8073616e98a2668da4a5f9aea90.tar.gz blackbird-obmc-uboot-794a5924972fc8073616e98a2668da4a5f9aea90.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'common/cmd_usb.c')
| -rw-r--r-- | common/cmd_usb.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 9be86b874d..f2795d3f40 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -316,7 +316,7 @@ int do_usbboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) image_header_t *hdr; block_dev_desc_t *stor_dev; #if defined(CONFIG_FIT) - const void *fit_hdr; + const void *fit_hdr = NULL; #endif switch (argc) { @@ -404,10 +404,6 @@ int do_usbboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #if defined(CONFIG_FIT) case IMAGE_FORMAT_FIT: fit_hdr = (const void *)addr; - if (!fit_check_format (fit_hdr)) { - puts ("** Bad FIT image format\n"); - return 1; - } puts ("Fit image detected...\n"); cnt = fit_get_size (fit_hdr); @@ -430,8 +426,13 @@ int do_usbboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #if defined(CONFIG_FIT) /* This cannot be done earlier, we need complete FIT image in RAM first */ - if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) - fit_print_contents ((const void *)addr); + if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) { + if (!fit_check_format (fit_hdr)) { + puts ("** Bad FIT image format\n"); + return 1; + } + fit_print_contents (fit_hdr); + } #endif /* Loading ok, update default load address */ |
