FDT: only call boot_get_fdt from generic code

[u-boot] / common / cmd_ximg.c

diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c
index 3e5fb44475b60fb98a228a8b40c8a15b3bdb85da..dceb975498beef93c2941afcbeacf5ba6a204ec2 100644 (file)
--- a/common/cmd_ximg.c
+++ b/common/cmd_ximg.c
@@ -43,7 +43,7 @@
 #endif
 
 int
-do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        ulong           addr = load_addr;
        ulong           dest = 0;
@@ -225,20 +225,25 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        break;
 #if defined(CONFIG_BZIP2)
                case IH_COMP_BZIP2:
-                       printf ("   Uncompressing part %d ... ", part);
-                       /*
-                        * If we've got less than 4 MB of malloc() space,
-                        * use slower decompression algorithm which requires
-                        * at most 2300 KB of memory.
-                        */
-                       i = BZ2_bzBuffToBuffDecompress
-                               ((char*)ntohl(hdr->ih_load),
-                                &unc_len, (char *)data, len,
-                                CONFIG_SYS_MALLOC_LEN < (4096 * 1024), 0);
-                       if (i != BZ_OK) {
-                               printf ("BUNZIP2 ERROR %d - "
-                                       "image not loaded\n", i);
-                               return 1;
+                       {
+                               int i;
+
+                               printf ("   Uncompressing part %d ... ", part);
+                               /*
+                                * If we've got less than 4 MB of malloc()
+                                * space, use slower decompression algorithm
+                                * which requires at most 2300 KB of memory.
+                                */
+                               i = BZ2_bzBuffToBuffDecompress(
+                                       (char*)ntohl(hdr->ih_load),
+                                       &unc_len, (char *)data, len,
+                                       CONFIG_SYS_MALLOC_LEN < (4096 * 1024),
+                                       0);
+                               if (i != BZ_OK) {
+                                       printf ("BUNZIP2 ERROR %d - "
+                                               "image not loaded\n", i);
+                                       return 1;
+                               }
                        }
                        break;
 #endif /* CONFIG_BZIP2 */
@@ -257,7 +262,8 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-U_BOOT_CMD(imxtract, 4, 1, do_imgextract,
+U_BOOT_CMD(
+       imxtract, 4, 1, do_imgextract,
        "extract a part of a multi-image",
        "addr part [dest]\n"
        "    - extract <part> from legacy image at <addr> and copy to <dest>"