Added support for STM32G4 chips (#822)

stlink-org · Feb 20, 2020 · dfd8512 · dfd8512
2 parents 1de2e4b + 8c8285f
commit dfd8512
Show file tree

Hide file tree

Showing 4 changed files with 131 additions and 83 deletions.
diff --git a/include/stlink.h b/include/stlink.h
@@ -79,6 +79,7 @@ extern "C" {
         STLINK_FLASH_TYPE_L4,
         STLINK_FLASH_TYPE_F1_XL,
         STLINK_FLASH_TYPE_G0,
+        STLINK_FLASH_TYPE_G4,
         STLINK_FLASH_TYPE_WB
     };
 

diff --git a/include/stlink/chipid.h b/include/stlink/chipid.h
@@ -72,6 +72,8 @@ enum stlink_stm32_chipids {
 	STLINK_CHIPID_STM32_F413             = 0x463,
 	STLINK_CHIPID_STM32_L4RX             = 0x470, // taken from the STM32L4R9I-DISCO board
 	STLINK_CHIPID_STM32_G0X1             = 0x460,
+	STLINK_CHIPID_STM32_G4_CAT2          = 0x468, // See: RM 0440 s46.6.1 "MCU device ID code".
+	STLINK_CHIPID_STM32_G4_CAT3          = 0x469,
 	STLINK_CHIPID_STM32_WB55             = 0x495
 };
 

diff --git a/src/chipid.c b/src/chipid.c
@@ -530,7 +530,18 @@ static const struct stlink_chipid_params devices[] = {
             .flash_pagesize = 0x800,         // 2K (sec 3.2)
             .sram_size = 0x9000,             // 36K (sec 2.3)
             .bootrom_base = 0x1fff0000,
-            .bootrom_size = 0x7800           // 30K (table 2)
+            .bootrom_size = 0x7000           // 28K (table 2)
+        },
+        {
+            // STM32G431/441 (from RM0440)
+            .chip_id = STLINK_CHIPID_STM32_G4_CAT2,
+            .description = "G4 Category-2 device",
+            .flash_type = STLINK_FLASH_TYPE_G4,
+            .flash_size_reg = 0x1FFF75E0,    // Section 47.2
+            .flash_pagesize = 0x800,         // 2K (sec 3.3.1)
+            .sram_size = 0x8000,             // 32K (sec 2.4)
+            .bootrom_base = 0x1fff0000,
+            .bootrom_size = 0x7000           // 28K (table 2)
         },
         {
             // STM32WB55 (from RM0434)