Merge pull request #1126 from Ant-ON/cm0p_fix

Fixed reading of chip ID on Cortex-M0+ core.
stlink-org · Apr 13, 2021 · cb551d5 · cb551d5
2 parents ee491d9 + d2a2c98
commit cb551d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/common.c b/src/common.c
@@ -1509,7 +1509,8 @@ int stlink_chip_id(stlink_t *sl, uint32_t *chip_id) {
             cpu_id.part == STLINK_REG_CMx_CPUID_PARTNO_CM7) {
         // STM32H7 chipid in 0x5c001000 (RM0433 pg3189)
         ret = stlink_read_debug32(sl, 0x5c001000, chip_id);
-    } else if (cpu_id.part == STLINK_REG_CMx_CPUID_PARTNO_CM0) {
+    } else if (cpu_id.part == STLINK_REG_CMx_CPUID_PARTNO_CM0 ||
+            cpu_id.part == STLINK_REG_CMx_CPUID_PARTNO_CM0P) {
         // STM32F0 (RM0091, pg914; RM0360, pg713)
         // STM32L0 (RM0377, pg813; RM0367, pg915; RM0376, pg917)
         // STM32G0 (RM0444, pg1367)

diff --git a/src/stlink-lib/reg.h b/src/stlink-lib/reg.h
@@ -4,6 +4,7 @@
 #define STLINK_REG_CM3_CPUID                0xE000ED00
 
 #define STLINK_REG_CMx_CPUID_PARTNO_CM0     0xC20
+#define STLINK_REG_CMx_CPUID_PARTNO_CM0P    0xC60
 #define STLINK_REG_CMx_CPUID_PARTNO_CM3     0xC23
 #define STLINK_REG_CMx_CPUID_PARTNO_CM4     0xC24
 #define STLINK_REG_CMx_CPUID_PARTNO_CM7     0xC27