Merge pull request #354 from gvz/master

[fw/stlink] / flash / main.c

diff --git a/flash/main.c b/flash/main.c
index 8f5b351de3df57710eff7b05080dbe3a51689cdb..d0d303a0dc8c0e545c1b11571f0b5a15a7420c75 100644 (file)
--- a/flash/main.c
+++ b/flash/main.c
@@ -9,35 +9,51 @@
 #include <sys/types.h>
 #include "stlink-common.h"
 
+#define DEBUG_LOG_LEVEL 100
+#define STND_LOG_LEVEL  50
+
 enum st_cmds {DO_WRITE = 0, DO_READ = 1, DO_ERASE = 2};
 struct opts
 {
     enum st_cmds cmd;
     const char* devname;
+       char *serial;
     const char* filename;
     stm32_addr_t addr;
     size_t size;
     int reset;
+    int log_level;
 };
 
 static void usage(void)
 {
-    puts("stlinkv1 command line: ./flash [--reset] {read|write} /dev/sgX path addr <size>");
-    puts("stlinkv1 command line: ./flash /dev/sgX erase");
-    puts("stlinkv2 command line: ./flash [--reset] {read|write} path addr <size>");
-    puts("stlinkv2 command line: ./flash erase");
-    puts("                       use hex format for addr and <size>");
+    puts("stlinkv1 command line: ./st-flash [--debug] [--reset] [--serial <iSerial>] {read|write} /dev/sgX path addr <size>");
+    puts("stlinkv1 command line: ./st-flash [--debug] /dev/sgX erase");
+    puts("stlinkv2 command line: ./st-flash [--debug] [--reset] [--serial <iSerial>] {read|write} path addr <size>");
+    puts("stlinkv2 command line: ./st-flash [--debug] [--serial <iSerial>] erase");
+    puts("                       use hex format for addr, <iSerial> and <size>");
 }
 
 static int get_opts(struct opts* o, int ac, char** av)
 {
-    /* stlinkv1 command line: ./flash {read|write} /dev/sgX path addr <size> */
-    /* stlinkv2 command line: ./flash {read|write} path addr <size> */
+    /* stlinkv1 command line: ./st-flash {read|write} /dev/sgX path addr <size> */
+    /* stlinkv2 command line: ./st-flash {read|write} path addr <size> */
 
     unsigned int i = 0;
 
     if (ac < 1) return -1;
 
+    if (strcmp(av[0], "--debug") == 0)
+    {
+        o->log_level = DEBUG_LOG_LEVEL;
+        ac--;
+        av++;
+    }
+    else
+    {
+        o->log_level = STND_LOG_LEVEL;
+    }
+
     if (strcmp(av[0], "--reset") == 0)
     {
         o->reset = 1;
@@ -49,6 +65,31 @@ static int get_opts(struct opts* o, int ac, char** av)
         o->reset = 0;
     }
 
+    if (strcmp(av[0], "--serial") == 0)
+    {
+        ac--;
+        av++;
+           int i=strlen(av[0]);
+           if(i%2 != 0){
+                   puts("no valid hex value, length must be multiple of 2\n");
+                   return -1;
+           }
+           int j=0;
+           while(i>=0 && j<=13){
+                   char buffer[3]={0};
+                   memcpy(buffer,&av[0][i],2);
+                   o->serial[12-j] = (char)strtol((const char*)buffer,NULL, 16);
+                   j++;
+                   i-=2;
+           }
+        ac--;
+        av++;
+    }
+    else
+    {
+        o->serial = NULL;
+    }
+
     if (ac < 1) return -1;
 
     /* stlinkv2 */
@@ -108,6 +149,8 @@ int main(int ac, char** av)
 {
     stlink_t* sl = NULL;
     struct opts o;
+    char serial_buffer[13] = {0};
+    o.serial = serial_buffer;
     int err = -1;
 
     o.size = 0;
@@ -120,15 +163,15 @@ int main(int ac, char** av)
 
     if (o.devname != NULL) /* stlinkv1 */
     {
-        sl = stlink_v1_open(50, 1);
+        sl = stlink_v1_open(o.log_level, 1);
         if (sl == NULL) goto on_error;
-        sl->verbose = 50;
+        sl->verbose = o.log_level;
     }
     else /* stlinkv2 */
     {
-        sl = stlink_open_usb(50, 1);
+           sl = stlink_open_usb(o.log_level, 1, o.serial);
         if (sl == NULL) goto on_error;
-        sl->verbose = 50;
+        sl->verbose = o.log_level;
     }
 
     if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
@@ -137,8 +180,10 @@ int main(int ac, char** av)
     if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
         stlink_enter_swd_mode(sl);
 
-    if (o.reset)
+    if (o.reset){
+        stlink_jtag_reset(sl,2);
         stlink_reset(sl);
+    }
 
     // Disable DMA - Set All DMA CCR Registers to zero. - AKS 1/7/2013
     if (sl->chip_id == STM32_CHIPID_F4)
@@ -151,6 +196,11 @@ int main(int ac, char** av)
             stlink_write_mem32(sl,0x40026400+0x24+0x18*i,4);
         }
     }
+
+    // Core must be halted to use RAM based flashloaders
+    stlink_force_debug(sl);
+    stlink_status(sl);
+
     if (o.cmd == DO_WRITE) /* write */
     {
         if ((o.addr >= sl->flash_base) &&
@@ -196,8 +246,10 @@ int main(int ac, char** av)
         }
     }
 
-    if (o.reset)
+    if (o.reset){
+        stlink_jtag_reset(sl,2);
         stlink_reset(sl);
+    }
 
     /* success */
     err = 0;