sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stm32f4: fix wrong idcode when probing (#1242) 

* stm32f4: fixed wrong idcode when probing

* stm32f4: fixed formatting

* stm32f4: t->part_id detection via DBGMCU_IDCODE

* stm32f4: stm32f4_probe() changes after check

* stm32f4: added missing t->mass_erase assignment

Co-authored-by: Andrew Novikov <andrew.novikov@cprime.com>
This commit is contained in:
andrew1x000 2022-09-20 21:03:27 +03:00 committed by GitHub
parent 868e76b2d0
commit 9f9d42861d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/target/stm32f4.c
View File

@ -207,36 +207,39 @@ static void stm32f4_detach(target *t)
bool stm32f4_probe(target *t) bool stm32f4_probe(target *t)
{ {
if (t->part_id == ID_STM32F20X) { uint16_t mcu_idcode = target_mem_read32(t, DBGMCU_IDCODE) & 0xfffU;
if (mcu_idcode == ID_STM32F20X) {
/* F405 revision A have a wrong IDCODE, use ARM_CPUID to make the /* F405 revision A have a wrong IDCODE, use ARM_CPUID to make the
* distinction with F205. Revision is also wrong (0x2000 instead * distinction with F205. Revision is also wrong (0x2000 instead
* of 0x1000). See F40x/F41x errata. */ * of 0x1000). See F40x/F41x errata. */
if ((t->cpuid & 0xFFF0) == CORTEX_M4) if ((t->cpuid & 0xFFF0) == CORTEX_M4)
t->part_id = ID_STM32F40X; mcu_idcode = ID_STM32F40X;
} }
switch(t->part_id) {
switch (mcu_idcode) {
case ID_STM32F74X: /* F74x RM0385 Rev.4 */ case ID_STM32F74X: /* F74x RM0385 Rev.4 */
case ID_STM32F76X: /* F76x F77x RM0410 */ case ID_STM32F76X: /* F76x F77x RM0410 */
case ID_STM32F72X: /* F72x F73x RM0431 */ case ID_STM32F72X: /* F72x F73x RM0431 */
case ID_STM32F40X:
case ID_STM32F42X: /* 427/437 */ case ID_STM32F42X: /* 427/437 */
case ID_STM32F46X: /* 469/479 */ case ID_STM32F46X: /* 469/479 */
case ID_STM32F20X: /* F205 */ case ID_STM32F20X: /* F205 */
case ID_STM32F446: /* F446 */ case ID_STM32F40X:
case ID_STM32F446: /* F446 */
case ID_STM32F401C: /* F401 B/C RM0368 Rev.3 */ case ID_STM32F401C: /* F401 B/C RM0368 Rev.3 */
case ID_STM32F411: /* F411 RM0383 Rev.4 */ case ID_STM32F411: /* F411 RM0383 Rev.4 */
case ID_STM32F412: /* F412 RM0402 Rev.4, 256 kB Ram */ case ID_STM32F412: /* F412 RM0402 Rev.4, 256 kB Ram */
case ID_STM32F401E: /* F401 D/E RM0368 Rev.3 */ case ID_STM32F401E: /* F401 D/E RM0368 Rev.3 */
case ID_STM32F413: /* F413 RM0430 Rev.2, 320 kB Ram, 1.5 MB flash. */ case ID_STM32F413: /* F413 RM0430 Rev.2, 320 kB Ram, 1.5 MB flash. */
t->mass_erase = stm32f4_mass_erase;
t->detach = stm32f4_detach;
t->driver = stm32f4_get_chip_name(t->part_id);
t->attach = stm32f4_attach; t->attach = stm32f4_attach;
t->detach = stm32f4_detach;
t->mass_erase = stm32f4_mass_erase;
t->driver = stm32f4_get_chip_name(t->part_id);
t->part_id = mcu_idcode;
target_add_commands(t, stm32f4_cmd_list, t->driver); target_add_commands(t, stm32f4_cmd_list, t->driver);
return true; return true;
default:
return false;
} }
return false;
} }
static bool stm32f4_attach(target *t) static bool stm32f4_attach(target *t)