mvebu: Introduce kconfig symbols for SoC variants

[u-boot] / common / cmd_ximg.c

diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c
index 65a8319662f13a18450f9c03a77b885590ee45ff..d033c15b629cf2a88823bde658110dde23da2903 100644 (file)
--- a/common/cmd_ximg.c
+++ b/common/cmd_ximg.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
+#include <mapmem.h>
 #include <watchdog.h>
 #if defined(CONFIG_BZIP2)
 #include <bzlib.h>
@@ -32,10 +33,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 +68,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 "
@@ -83,7 +88,8 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
                image_print_contents(hdr);
 #endif
 
-               if (!image_check_type(hdr, IH_TYPE_MULTI)) {
+               if (!image_check_type(hdr, IH_TYPE_MULTI) &&
+                   !image_check_type(hdr, IH_TYPE_SCRIPT)) {
                        printf("Wrong Image Type for %s command\n",
                                        cmdtp->name);
                        return 1;
@@ -114,6 +120,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 +218,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;
@@ -242,6 +249,8 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
                puts("OK\n");
        }
 
+       flush_cache(dest, len);
+
        setenv_hex("fileaddr", data);
        setenv_hex("filesize", len);