Merge pull request #138 from 6thimage/master

Fix for programming STM32L152

diff --git a/flash/main.c b/flash/main.c
index 1d616ae956d7cc394b7303ea84aa5c08c40bc2ca..110c2964d894fc85136e7ea65adf6c8842ec120a 100644 (file)
--- a/flash/main.c
+++ b/flash/main.c
@@ -124,6 +124,8 @@ int main(int ac, char** av)
     stlink_enter_swd_mode(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);
@@ -131,6 +133,7 @@ int main(int ac, char** av)
            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) &&

diff --git a/src/stlink-common.c b/src/stlink-common.c
index 4c662fbcf7052d54c83b1b41f913f7006653dafe..a60f2b67038b30b667df0560e48299ca0c1e3e5e 100644 (file)
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -1779,7 +1779,7 @@ int run_flash_loader(stlink_t *sl, flash_loader_t* fl, stm32_addr_t target, cons
     }
 
     if (i >= WAIT_ROUNDS) {
-        fatal("flash loader run error\n");
+        ELOG("flash loader run error\n");
         return -1;
     }