Add --reset option to trigger a reset both before and after flashing.

[fw/stlink] / flash / main.c

diff --git a/flash/main.c b/flash/main.c
index 24287456b41e283abc6624711267532b4de83fd9..014b627e9da288df2c8434bdebf176228827ecd6 100644 (file)
--- a/flash/main.c
+++ b/flash/main.c
@@ -17,13 +17,14 @@ struct opts
   const char* filename;
   stm32_addr_t addr;
   size_t size;
+  int reset;
 };
 
 static void usage(void)
 {
-    puts("stlinkv1 command line: ./flash {read|write} /dev/sgX path addr <size>");
+    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 {read|write} path addr <size>");
+    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>");
 }
@@ -37,6 +38,17 @@ static int get_opts(struct opts* o, int ac, char** av)
 
   if (ac < 1) return -1;
 
+  if (strcmp(av[0], "--reset") == 0)
+  {
+    o->reset = 1;
+    ac--;
+    av++;
+  }
+  else
+  {
+    o->reset = 0;
+  }
+
   /* stlinkv2 */
   o->devname = NULL;
 
@@ -106,13 +118,13 @@ int main(int ac, char** av)
 
   if (o.devname != NULL) /* stlinkv1 */
   {
-    sl = stlink_v1_open(50);
+    sl = stlink_v1_open(50, 1);
     if (sl == NULL) goto on_error;
     sl->verbose = 50;
   }
   else /* stlinkv2 */
   {
-    sl = stlink_open_usb(50);
+    sl = stlink_open_usb(50, 1);
     if (sl == NULL) goto on_error;
     sl->verbose = 50;
   }
@@ -123,6 +135,20 @@ int main(int ac, char** av)
   if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
     stlink_enter_swd_mode(sl);
 
+  if (o.reset)
+    stlink_reset(sl);
+
+// Disable DMA - Set All DMA CCR Registers to zero. - AKS 1/7/2013
+  if (sl->chip_id == STM32_CHIPID_F4)
+  {
+    memset(sl->q_buf,0,4);
+       for (int i=0;i<8;i++) {
+           stlink_write_mem32(sl,0x40026000+0x10+0x18*i,4);
+           stlink_write_mem32(sl,0x40026400+0x10+0x18*i,4);
+           stlink_write_mem32(sl,0x40026000+0x24+0x18*i,4);
+           stlink_write_mem32(sl,0x40026400+0x24+0x18*i,4);
+       }
+  }
   if (o.cmd == DO_WRITE) /* write */
   {
     if ((o.addr >= sl->flash_base) &&
@@ -135,7 +161,7 @@ int main(int ac, char** av)
        }
     }
    else if ((o.addr >= sl->sram_base) &&
-            (o.addr < sl->sram_base + sl->sram_size))
+            (o.addr < sl->sram_base + sl->sram_size)) {
        err = stlink_fwrite_sram(sl, o.filename, o.addr);
        if (err == -1)
        {
@@ -143,7 +169,7 @@ int main(int ac, char** av)
            goto on_error;
        }
    }
-  else if (o.cmd == DO_ERASE) 
+  } else if (o.cmd == DO_ERASE) 
   {
      err = stlink_erase_flash_mass(sl);
     if (err == -1)
@@ -154,10 +180,10 @@ int main(int ac, char** av)
   }
   else /* read */
   {
-    if ((o.addr >= sl->flash_base) &&
+    if ((o.addr >= sl->flash_base) && (o.size == 0) &&
        (o.addr < sl->flash_base + sl->flash_size))
         o.size = sl->flash_size;
-    else if ((o.addr >= sl->sram_base) &&
+    else if ((o.addr >= sl->sram_base) && (o.size == 0) &&
             (o.addr < sl->sram_base + sl->sram_size))
         o.size = sl->sram_size;
     err = stlink_fread(sl, o.filename, o.addr, o.size);
@@ -168,6 +194,9 @@ int main(int ac, char** av)
     }
   }
 
+  if (o.reset)
+    stlink_reset(sl);
+
   /* success */
   err = 0;