aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schodet2015-08-12 16:48:22 +0200
committerNicolas Schodet2015-08-12 16:48:22 +0200
commit771a94375eed63425138c467d33b826c4bfa5afc (patch)
tree54d2c27679b25ac20e671acb076c5e9ca639020d
parentb8f242a9fd1c6115e63f97fc6ed7e49ef99fac72 (diff)
parentef574b72b14e10c964f1aa73348d3048f88d1029 (diff)
Merge remote-tracking branch 'github/master' into dev2
-rw-r--r--src/stm32f1.c18
-rw-r--r--src/stm32f4.c1
2 files changed, 9 insertions, 10 deletions
diff --git a/src/stm32f1.c b/src/stm32f1.c
index fecebdf..68d4b51 100644
--- a/src/stm32f1.c
+++ b/src/stm32f1.c
@@ -161,17 +161,16 @@ bool stm32f1_probe(target *t)
t->driver = "STM32F09";
block_size = 0x800;
break;
- }
- if (t->driver) {
- flash_size = (target_mem_read32(t, FLASHSIZE_F0) & 0xffff) *0x400;
- gdb_outf("flash size %d block_size %d\n", flash_size, block_size);
- target_add_ram(t, 0x20000000, 0x5000);
- stm32f1_add_flash(t, 0x8000000, flash_size, block_size);
- target_add_commands(t, stm32f1_cmd_list, "STM32F0");
- return true;
+ default: /* NONE */
+ return false;
}
- return false;
+ flash_size = (target_mem_read32(t, FLASHSIZE_F0) & 0xffff) *0x400;
+ gdb_outf("flash size %d block_size %d\n", flash_size, block_size);
+ target_add_ram(t, 0x20000000, 0x5000);
+ stm32f1_add_flash(t, 0x8000000, flash_size, block_size);
+ target_add_commands(t, stm32f1_cmd_list, "STM32F0");
+ return true;
}
static void stm32f1_flash_unlock(target *t)
@@ -353,4 +352,3 @@ static bool stm32f1_cmd_option(target *t, int argc, char *argv[])
}
return true;
}
-
diff --git a/src/stm32f4.c b/src/stm32f4.c
index 7b7a92e..6446a15 100644
--- a/src/stm32f4.c
+++ b/src/stm32f4.c
@@ -136,6 +136,7 @@ bool stm32f4_probe(target *t)
/* Fall through for stuff common to F40x/F41x */
case 0x411: /* Documented to be 0x413! This is what I read... */
case 0x413: /* F407VGT6 */
+ case 0x421: /* F446 */
case 0x423: /* F401 B/C RM0368 Rev.3 */
case 0x431: /* F411 RM0383 Rev.4 */
case 0x433: /* F401 D/E RM0368 Rev.3 */