Merge branch 'testing' into develop

- Moved chip-specific parameters into separate files (#1129) - Aligned chip names & references - General spelling & formatting fixes - Set of fixes and improvements (#1154) (Closes #237)
stlink-org · Jul 16, 2021 · dc5388d · dc5388d
2 parents 6e0dbfe + a2a6878
commit dc5388d
Show file tree

Hide file tree

Showing 72 changed files with 1,564 additions and 638 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,6 +9,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
+set(CMAKE_STLINK_ETC_DIR  etc)
+set(CMAKE_ETC_CHIPS_DIR  ${CMAKE_STLINK_ETC_DIR}/stlink/chips)
+set(CMAKE_ETC_CHIPS_DIR_ABS  ${CMAKE_INSTALL_PREFIX}/${CMAKE_ETC_CHIPS_DIR})
+add_definitions( -DETC_STLINK_DIR="${CMAKE_ETC_CHIPS_DIR_ABS}" )
+
 
 ###
 # General project settings
@@ -277,6 +282,9 @@ install(TARGETS st-info DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(TARGETS st-util DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(TARGETS st-trace DESTINATION ${CMAKE_INSTALL_BINDIR})
 
+file(GLOB CHIP_FILES ${CMAKE_SOURCE_DIR}/config/chips/*.chip)
+install(FILES ${CHIP_FILES} DESTINATION ${CMAKE_ETC_CHIPS_DIR})
+
 
 ###
 # Device configuration (Linux only)

diff --git a/config/chips/F04x.chip b/config/chips/F04x.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F04x
+#
+chip_id 0x445
+description F04x
+flash_type 1
+flash_pagesize 400
+sram_size 0x1800
+bootrom_base 0x1fffec00
+bootrom_size 0xc00
+option_base 0x0
+option_size 0x0
+flags none
+
diff --git a/config/chips/F07x.chip b/config/chips/F07x.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F07x
+#
+chip_id 0x448
+description F07x
+flash_type 1
+flash_pagesize 800
+sram_size 0x4000
+bootrom_base 0x1fffc800
+bootrom_size 0x3000
+option_base 0x0
+option_size 0x0
+flags none
+
diff --git a/config/chips/F09x.chip b/config/chips/F09x.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F09x
+#
+chip_id 0x442
+description F09x
+flash_type 1
+flash_pagesize 800
+sram_size 0x8000
+bootrom_base 0x1fffd800
+bootrom_size 0x2000
+option_base 0x0
+option_size 0x0
+flags none
+
diff --git a/config/chips/F0xx.chip b/config/chips/F0xx.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F0xx
+#
+chip_id 0x440
+description F0xx
+flash_type 1
+flash_pagesize 400
+sram_size 0x2000
+bootrom_base 0x1fffec00
+bootrom_size 0xc00
+option_base 0x0
+option_size 0x0
+flags none
+
diff --git a/config/chips/F0xx_small.chip b/config/chips/F0xx_small.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F0xx small
+#
+chip_id 0x444
+description F0xx small
+flash_type 1
+flash_pagesize 400
+sram_size 0x1000
+bootrom_base 0x1fffec00
+bootrom_size 0xc00
+option_base 0x0
+option_size 0x0
+flags none
+
diff --git a/config/chips/F1_XL-density.chip b/config/chips/F1_XL-density.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F1 XL-density
+#
+chip_id 0x430
+description F1 XL-density
+flash_type 2
+flash_pagesize 800
+sram_size 0x18000
+bootrom_base 0x1fffe000
+bootrom_size 0x1800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F1_connectivity_line.chip b/config/chips/F1_connectivity_line.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F1 connectivity line
+#
+chip_id 0x418
+description F1 connectivity line
+flash_type 1
+flash_pagesize 800
+sram_size 0x10000
+bootrom_base 0x1fffb000
+bootrom_size 0x4800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F1_high-density.chip b/config/chips/F1_high-density.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F1 high-density
+#
+chip_id 0x414
+description F1 high-density
+flash_type 1
+flash_pagesize 800
+sram_size 0x10000
+bootrom_base 0x1ffff000
+bootrom_size 0x800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F1_low-density.chip b/config/chips/F1_low-density.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F1 low-density
+#
+chip_id 0x412
+description F1 low-density
+flash_type 1
+flash_pagesize 400
+sram_size 0x2800
+bootrom_base 0x1ffff000
+bootrom_size 0x800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F1_medium-density.chip b/config/chips/F1_medium-density.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F1 medium-density
+#
+chip_id 0x410
+description F1 medium-density
+flash_type 1
+flash_pagesize 400
+sram_size 0x5000
+bootrom_base 0x1ffff000
+bootrom_size 0x800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F1_value_line.chip b/config/chips/F1_value_line.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F1 value line
+#
+chip_id 0x420
+description F1 value line
+flash_type 1
+flash_pagesize 400
+sram_size 0x2000
+bootrom_base 0x1ffff000
+bootrom_size 0x800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F1_value_line_high-density.chip b/config/chips/F1_value_line_high-density.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F1 value line high-density
+#
+chip_id 0x428
+description F1 value line high-density
+flash_type 1
+flash_pagesize 800
+sram_size 0x8000
+bootrom_base 0x1ffff000
+bootrom_size 0x800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F2.chip b/config/chips/F2.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F2
+#
+chip_id 0x411
+description F2
+flash_type 3
+flash_pagesize 20000
+sram_size 0x20000
+bootrom_base 0x1fff0000
+bootrom_size 0x7800
+option_base 0x1fffc000
+option_size 0x4
+flags swo
+
diff --git a/config/chips/F303_high_density.chip b/config/chips/F303_high_density.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F303 high density
+#
+chip_id 0x446
+description F303 high density
+flash_type 1
+flash_pagesize 800
+sram_size 0x10000
+bootrom_base 0x1fffd800
+bootrom_size 0x2000
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F334_medium_density.chip b/config/chips/F334_medium_density.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F334 medium density
+#
+chip_id 0x438
+description F334 medium density
+flash_type 1
+flash_pagesize 800
+sram_size 0x3000
+bootrom_base 0x1fffd800
+bootrom_size 0x2000
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F37x.chip b/config/chips/F37x.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F37x
+#
+chip_id 0x432
+description F37x
+flash_type 1
+flash_pagesize 800
+sram_size 0xa000
+bootrom_base 0x1ffff000
+bootrom_size 0x800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F3xx_small.chip b/config/chips/F3xx_small.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F3xx small
+#
+chip_id 0x439
+description F3xx small
+flash_type 1
+flash_pagesize 800
+sram_size 0xa000
+bootrom_base 0x1fffd800
+bootrom_size 0x2000
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F410.chip b/config/chips/F410.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F410
+#
+chip_id 0x458
+description F410
+flash_type 3
+flash_pagesize 4000
+sram_size 0x8000
+bootrom_base 0x1fff0000
+bootrom_size 0x7800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F411xx.chip b/config/chips/F411xx.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F411xx
+#
+chip_id 0x431
+description F411xx
+flash_type 3
+flash_pagesize 4000
+sram_size 0x20000
+bootrom_base 0x1fff0000
+bootrom_size 0x7800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F412.chip b/config/chips/F412.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F412
+#
+chip_id 0x441
+description F412
+flash_type 3
+flash_pagesize 4000
+sram_size 0x40000
+bootrom_base 0x1fff0000
+bootrom_size 0x7800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F413.chip b/config/chips/F413.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F413
+#
+chip_id 0x463
+description F413
+flash_type 3
+flash_pagesize 4000
+sram_size 0x50000
+bootrom_base 0x1fff0000
+bootrom_size 0x7800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F42x_F43x.chip b/config/chips/F42x_F43x.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F42x/F43x
+#
+chip_id 0x419
+description F42x/F43x
+flash_type 3
+flash_pagesize 4000
+sram_size 0x40000
+bootrom_base 0x1fff0000
+bootrom_size 0x7800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F446.chip b/config/chips/F446.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F446
+#
+chip_id 0x421
+description F446
+flash_type 3
+flash_pagesize 20000
+sram_size 0x20000
+bootrom_base 0x1fff0000
+bootrom_size 0x7800
+option_base 0x1fffc000
+option_size 0x4
+flags swo
+
diff --git a/config/chips/F46x_F47x.chip b/config/chips/F46x_F47x.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F46x/F47x
+#
+chip_id 0x434
+description F46x/F47x
+flash_type 3
+flash_pagesize 4000
+sram_size 0x40000
+bootrom_base 0x1fff0000
+bootrom_size 0x7800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F4xx.chip b/config/chips/F4xx.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F4xx
+#
+chip_id 0x413
+description F4xx
+flash_type 3
+flash_pagesize 4000
+sram_size 0x30000
+bootrom_base 0x1fff0000
+bootrom_size 0x7800
+option_base 0x40023c14
+option_size 0x4
+flags swo
+
diff --git a/config/chips/F4xx_dynamic_efficiency.chip b/config/chips/F4xx_dynamic_efficiency.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F4xx dynamic efficiency
+#
+chip_id 0x433
+description F4xx dynamic efficiency
+flash_type 3
+flash_pagesize 4000
+sram_size 0x18000
+bootrom_base 0x1fff0000
+bootrom_size 0x7800
+option_base 0x0
+option_size 0x0
+flags swo
+
diff --git a/config/chips/F4xx_low_power.chip b/config/chips/F4xx_low_power.chip
@@ -0,0 +1,13 @@
+# Chip-ID file for F4xx low power
+#
+chip_id 0x423
+description F4xx low power
+flash_type 3
+flash_pagesize 4000
+sram_size 0x10000
+bootrom_base 0x1fff0000
+bootrom_size 0x7800
+option_base 0x0
+option_size 0x0
+flags swo
+