[new uImage] Update naming convention for bootm/uImage related code

[people/ms/u-boot.git] / common / cmd_ximg.c

diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c
index 4dadc3709d6615c73d7b16363567cc709da3f3a5..360b05e1b36b3117c856d47b212e171444fc4911 100644 (file)
--- a/common/cmd_ximg.c
+++ b/common/cmd_ximg.c
@@ -57,7 +57,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        }
 
 
-       switch (gen_image_get_format ((void *)addr)) {
+       switch (genimg_get_format ((void *)addr)) {
        case IMAGE_FORMAT_LEGACY:
 
                printf("## Copying from legacy image at %08lx ...\n", addr);
@@ -104,7 +104,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        data += 4;
                        if (argc > 2 && part > i) {
                                u_long tail;
-                               len = image_to_cpu (len_ptr[i]);
+                               len = uimage_to_cpu (len_ptr[i]);
                                tail = len % 4;
                                data += len;
                                if (tail) {
@@ -116,7 +116,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        printf("Bad Image Part\n");
                        return 1;
                }
-               len = image_to_cpu (len_ptr[part]);
+               len = uimage_to_cpu (len_ptr[part]);
 #if defined(CONFIG_FIT)
        case IMAGE_FORMAT_FIT:
                fit_unsupported ("imxtract");