Merge branch 'tmaster' into future

[fw/stlink] / flash / main.c

diff --git a/flash/main.c b/flash/main.c
index 44157816e9084b93359b3ae19bcba82725cafbfd..5637489236c7785c806efbebbcc9e2f9e90bda6d 100644 (file)
--- a/flash/main.c
+++ b/flash/main.c
@@ -23,6 +23,7 @@ static void usage(void)
 {
     puts("stlinkv1 command line: ./flash {read|write} /dev/sgX path addr <size>");
     puts("stlinkv2 command line: ./flash {read|write} path addr <size>");
+    puts("                       use hex format for addr and <size>");
 }
 
 static int get_opts(struct opts* o, int ac, char** av)
@@ -48,7 +49,7 @@ static int get_opts(struct opts* o, int ac, char** av)
       i = 1;
     }
 
-    o->size = strtoul(av[i + 3], NULL, 10);
+    o->size = strtoul(av[i + 3], NULL, 16);
   }
   else if (strcmp(av[0], "write") == 0)
   {