From a025c9a7bd00b78000d5bbda2c12b0087e0b61d1 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Fri, 26 Mar 2021 15:28:08 +0100 Subject: [PATCH] Revert "stm32f1: On ST parts there is no need to read IDCODE again." Romtable partno is not unique for devices, e.g. in STM32F0 This reverts commit f89b07d892c6034ea68494a72e047b2c437754f7. --- src/target/stm32f1.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/target/stm32f1.c b/src/target/stm32f1.c index fb2d0af..a0ade73 100644 --- a/src/target/stm32f1.c +++ b/src/target/stm32f1.c @@ -155,6 +155,11 @@ bool gd32f1_probe(target *t) bool stm32f1_probe(target *t) { + uint16_t stored_idcode = t->idcode; + if ((t->cpuid & CPUID_PARTNO_MASK) == CORTEX_M0) + t->idcode = target_mem_read32(t, DBGMCU_IDCODE_F0) & 0xfff; + else + t->idcode = target_mem_read32(t, DBGMCU_IDCODE) & 0xfff; size_t flash_size; size_t block_size = 0x400; switch(t->idcode) { @@ -227,6 +232,7 @@ bool stm32f1_probe(target *t) block_size = 0x800; break; default: /* NONE */ + t->idcode = stored_idcode; return false; }