Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / board / siemens / common / fpga.c

diff --git a/board/siemens/common/fpga.c b/board/siemens/common/fpga.c
index 9d719460dc0f99ea444c8bcaff509d71d96407bc..ef8bfde7f1dbb1293c931c531d13ff8b869a967d 100644 (file)
--- a/board/siemens/common/fpga.c
+++ b/board/siemens/common/fpga.c
@@ -137,6 +137,13 @@ static int fpga_load (fpga_t* fpga, ulong addr, int checkall)
     char msg[32];
     int verify, i;
 
+#if defined(CONFIG_FIT)
+    if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
+       puts ("Non legacy image format not supported\n");
+       return -1;
+    }
+#endif
+
     /*
      * Check the image header and data of the net-list
      */
@@ -153,7 +160,7 @@ static int fpga_load (fpga_t* fpga, ulong addr, int checkall)
     data = (uchar*)image_get_data (hdr);
     len  = image_get_data_size (hdr);
 
-    verify = getenv_verify ();
+    verify = getenv_yesno ("verify");
     if (verify) {
        if (!image_check_dcrc (hdr)) {
            strcpy (msg, "Bad Image Data CRC");
@@ -215,7 +222,7 @@ static int fpga_load (fpga_t* fpga, ulong addr, int checkall)
 
 /* . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . */
 
-int do_fpga (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_fpga (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
     ulong addr = 0;
     int i;
@@ -279,16 +286,15 @@ int do_fpga (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
     return 0;
 
  failure:
-    printf ("Usage:\n%s\n", cmdtp->usage);
-    return 1;
+    return cmd_usage(cmdtp);
 }
 
 U_BOOT_CMD(
        fpga,   4,      1,      do_fpga,
-       "fpga    - access FPGA(s)\n",
+       "access FPGA(s)",
        "fpga status [name] - print FPGA status\n"
        "fpga reset  [name] - reset FPGA\n"
-       "fpga load [name] addr - load FPGA configuration data\n"
+       "fpga load [name] addr - load FPGA configuration data"
 );
 
 #endif
@@ -333,6 +339,13 @@ int fpga_init (void)
        }
 
        hdr = (image_header_t *)addr;
+#if defined(CONFIG_FIT)
+       if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
+          puts ("Non legacy image format not supported\n");
+          return -1;
+       }
+#endif
+
        if ((new_id = fpga_get_version(fpga, image_get_name (hdr))) == -1)
            return 1;