X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstlink-common.c;h=6ccc357e7115e9742ae727f0804ce10dad99e6ec;hb=d2b5373e306b2a942a5dd93dec596570cd98f29d;hp=707316cc988051daf4bd4085a486870f0084db65;hpb=06635ce41fcc02716a2a16cda487ee3d207800ca;p=fw%2Fstlink

diff --git a/src/stlink-common.c b/src/stlink-common.c
index 707316c..6ccc357 100644
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -29,9 +29,10 @@ void DD(stlink_t *sl, char *format, ...) {
 }
 
 
+/* todo: stm32l15xxx flash memory, pm0062 manual */
+/* #define FLASH_REGS_ADDR 0x40022000 */
 
-/* FPEC flash controller interface, pm0063 manual
- */
+/* stm32f FPEC flash controller interface, pm0063 manual */
 
 #define FLASH_REGS_ADDR 0x40022000
 #define FLASH_REGS_SIZE 0x28
@@ -773,7 +774,7 @@ int init_flash_loader(stlink_t *sl, flash_loader_t* fl) {
 
 int write_loader_to_sram(stlink_t *sl, stm32_addr_t* addr, size_t* size) {
     /* from openocd, contrib/loaders/flash/stm32.s */
-    static const uint8_t loader_code[] = {
+    static const uint8_t loader_code_stm32vl[] = {
         0x08, 0x4c, /* ldr	r4, STM32_FLASH_BASE */
         0x1c, 0x44, /* add	r4, r3 */
         /* write_half_word: */
@@ -794,11 +795,39 @@ int write_loader_to_sram(stlink_t *sl, stm32_addr_t* addr, size_t* size) {
         0x00, 0x20, 0x02, 0x40, /* STM32_FLASH_BASE: .word 0x40022000 */
     };
 
-    memcpy(sl->q_buf, loader_code, sizeof (loader_code));
-    stlink_write_mem32(sl, sl->sram_base, sizeof (loader_code));
+    static const uint8_t loader_code_stm32l[] = {
+      /* see openocd.git/contib/loaders/flash/stm32lx.s for src */
+      0x00, 0x23,
+      0x04, 0xe0,
+
+      0x51, 0xf8, 0x04, 0xcb,
+      0x40, 0xf8, 0x04, 0xcb,
+      0x01, 0x33,
+
+      0x93, 0x42,
+      0xf8, 0xd3,
+      0x00, 0xbe
+    };
+
+    const uint8_t* loader_code;
+    size_t loader_size;
+
+    if (sl->core_id == 0x2ba01477) /* stm32l */
+    {
+      loader_code = loader_code_stm32l;
+      loader_size = sizeof(loader_code_stm32l);
+    }
+    else /* stm32vl */
+    {
+      loader_code = loader_code_stm32vl;
+      loader_size = sizeof(loader_code_stm32vl);
+    }
+
+    memcpy(sl->q_buf, loader_code, loader_size);
+    stlink_write_mem32(sl, sl->sram_base, loader_size);
 
     *addr = sl->sram_base;
-    *size = sizeof (loader_code);
+    *size = loader_size;
 
     /* success */
     return 0;
@@ -845,6 +874,9 @@ int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, unsigned
         return -1;
     }
 
+    /* needed for specializing loader */
+    stlink_core_id(sl);
+
     /* flash loader initialization */
     if (init_flash_loader(sl, &fl) == -1) {
         fprintf(stderr, "init_flash_loader() == -1\n");
@@ -914,6 +946,9 @@ int stlink_fwrite_flash(stlink_t *sl, const char* path, stm32_addr_t addr) {
         goto on_error;
     }
 
+    /* needed for specializing loader */
+    stlink_core_id(sl);
+
     /* erase each page. todo: mass erase faster? */
     for (off = 0; off < mf.len; off += sl->flash_pgsz) {
         /* addr must be an addr inside the page */
@@ -993,4 +1028,4 @@ int run_flash_loader(stlink_t *sl, flash_loader_t* fl, stm32_addr_t target, cons
     }
 
     return 0;
-}
\ No newline at end of file
+}