X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstlink-common.c;h=5cbf7febbfa03c74c816cef681ba8a259e338eee;hb=8c36e07cbefc41751807d9e327c116d3755cc6aa;hp=87dfc02fbb45ea8b863b4c06ea245bddb2e0c02b;hpb=41e7c16cf2f9c6db6b4cc4d61af86a359646d6be;p=fw%2Fstlink

diff --git a/src/stlink-common.c b/src/stlink-common.c
index 87dfc02..5cbf7fe 100644
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -1053,26 +1053,44 @@ int stlink_erase_flash_page(stlink_t *sl, stm32_addr_t flashaddr)
 }
 
 int stlink_erase_flash_mass(stlink_t *sl) {
-    /* wait for ongoing op to finish */
-    wait_flash_busy(sl);
-
-    /* unlock if locked */
-    unlock_flash_if(sl);
-
-    /* set the mass erase bit */
-    set_flash_cr_mer(sl);
-
-    /* start erase operation, reset by hw with bsy bit */
-    set_flash_cr_strt(sl);
-
-    /* wait for completion */
-    wait_flash_busy(sl);
-
-    /* relock the flash */
-    lock_flash(sl);
-
-    /* todo: verify the erased memory */
-
+     if (sl->chip_id == STM32_CHIPID_F4) {
+        DLOG("(FIXME) Mass erase of STM32F4\n");
+      }
+     else if (sl->chip_id == STM32_CHIPID_L1_MEDIUM) {
+	 /* erase each page */
+	 int i = 0, num_pages = sl->flash_size/sl->flash_pgsz;
+	 for (i = 0; i < num_pages; i++) {
+	     /* addr must be an addr inside the page */
+	     stm32_addr_t addr = sl->flash_base + i * sl->flash_pgsz;
+	     if (stlink_erase_flash_page(sl, addr) == -1) {
+		 WLOG("Failed to erase_flash_page(%#zx) == -1\n", addr);
+		 return -1;
+	     }
+	     fprintf(stdout,"\rFlash page at %5d/%5d erased", i, num_pages);
+	     fflush(stdout);
+	 }
+     }
+     else {
+	 /* wait for ongoing op to finish */
+	 wait_flash_busy(sl);
+	 
+	 /* unlock if locked */
+	 unlock_flash_if(sl);
+	 
+	 /* set the mass erase bit */
+	 set_flash_cr_mer(sl);
+	 
+	 /* start erase operation, reset by hw with bsy bit */
+	 set_flash_cr_strt(sl);
+	 
+	 /* wait for completion */
+	 wait_flash_busy(sl);
+	 
+	 /* relock the flash */
+	 lock_flash(sl);
+	 
+	 /* todo: verify the erased memory */
+     }
     return 0;
 }