Skip to content

Commit 8da1ae8

Browse files
Merge pull request #1300 from stlink-org/f2023_1
Initial support for STM32 L5 & U5 devices and minor changes
2 parents c721751 + 982408e commit 8da1ae8

26 files changed

+609
-577
lines changed

.github/workflows/c-cpp.yml

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ on:
99
jobs:
1010
# Linux
1111

12-
job_linux_18_04_64_gcc:
13-
name: ubuntu-18.04 gcc
14-
runs-on: ubuntu-18.04
12+
job_linux_20_04_64_gcc:
13+
name: ubuntu-20.04 gcc
14+
runs-on: ubuntu-20.04
1515
steps:
1616
- uses: actions/checkout@v2
17-
- name: install dependencies
18-
run: sudo apt update && sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
17+
- name: Install dependencies
18+
run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
1919
- name: make debug
2020
run: sudo make clean && make debug
2121
- name: make test
@@ -29,13 +29,13 @@ jobs:
2929
- name: sudo make uninstall
3030
run: sudo make uninstall && sudo make clean
3131

32-
job_linux_18_04_32_gcc:
33-
name: ubuntu-18.04 gcc 32-bit
34-
runs-on: ubuntu-18.04
32+
job_linux_20_04_32_gcc:
33+
name: ubuntu-20.04 gcc 32-bit
34+
runs-on: ubuntu-20.04
3535
steps:
3636
- uses: actions/checkout@v2
37-
- name: install dependencies
38-
run: sudo apt update && sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
37+
- name: Install dependencies
38+
run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
3939
- name: Set compiler flags
4040
run: |
4141
CFLAGS="$CFLAGS -m32"
@@ -54,13 +54,13 @@ jobs:
5454
- name: sudo make uninstall
5555
run: sudo make uninstall && sudo make clean
5656

57-
job_linux_18_04_64_clang:
58-
name: ubuntu-18.04 clang
59-
runs-on: ubuntu-18.04
57+
job_linux_20_04_64_clang:
58+
name: ubuntu-20.04 clang
59+
runs-on: ubuntu-20.04
6060
steps:
6161
- uses: actions/checkout@v2
62-
- name: install dependencies
63-
run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
62+
- name: Install dependencies
63+
run: sudo apt update && sudo apt-get install clang-12 libusb-1.0.0-dev libgtk-3-dev rpm
6464
- name: make debug
6565
run: sudo make clean && make debug
6666
- name: make test
@@ -74,13 +74,13 @@ jobs:
7474
- name: sudo make uninstall
7575
run: sudo make uninstall && sudo make clean
7676

77-
job_linux_18_04_32_clang:
78-
name: ubuntu-18.04 clang 32-bit
79-
runs-on: ubuntu-18.04
77+
job_linux_20_04_32_clang:
78+
name: ubuntu-20.04 clang 32-bit
79+
runs-on: ubuntu-20.04
8080
steps:
8181
- uses: actions/checkout@v2
8282
- name: Install dependencies
83-
run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
83+
run: sudo apt update && sudo apt-get install clang-12 libusb-1.0.0-dev libgtk-3-dev rpm
8484
- name: Set compiler flags
8585
run: |
8686
CFLAGS="$CFLAGS -m32"
@@ -99,13 +99,13 @@ jobs:
9999
- name: sudo make uninstall
100100
run: sudo make uninstall && sudo make clean
101101

102-
job_linux_20_04_64_gcc:
103-
name: ubuntu-20.04 gcc
104-
runs-on: ubuntu-20.04
102+
job_linux_22_04_64_gcc:
103+
name: ubuntu-22.04 gcc
104+
runs-on: ubuntu-22.04
105105
steps:
106106
- uses: actions/checkout@v2
107107
- name: Install dependencies
108-
run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
108+
run: sudo apt update && sudo apt-get install gcc-12 libusb-1.0.0-dev libgtk-4-dev rpm
109109
- name: make debug
110110
run: sudo make clean && make debug
111111
- name: make test
@@ -119,13 +119,13 @@ jobs:
119119
- name: sudo make uninstall
120120
run: sudo make uninstall && sudo make clean
121121

122-
job_linux_20_04_32_gcc:
123-
name: ubuntu-20.04 gcc 32-bit
124-
runs-on: ubuntu-20.04
122+
job_linux_22_04_32_gcc:
123+
name: ubuntu-22.04 gcc 32-bit
124+
runs-on: ubuntu-22.04
125125
steps:
126126
- uses: actions/checkout@v2
127127
- name: Install dependencies
128-
run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
128+
run: sudo apt update && sudo apt-get install gcc-12 libusb-1.0.0-dev libgtk-4-dev rpm
129129
- name: Set compiler flags
130130
run: |
131131
CFLAGS="$CFLAGS -m32"
@@ -144,13 +144,13 @@ jobs:
144144
- name: sudo make uninstall
145145
run: sudo make uninstall && sudo make clean
146146

147-
job_linux_20_04_64_clang:
148-
name: ubuntu-20.04 clang
149-
runs-on: ubuntu-20.04
147+
job_linux_22_04_64_clang:
148+
name: ubuntu-22.04 clang
149+
runs-on: ubuntu-22.04
150150
steps:
151151
- uses: actions/checkout@v2
152152
- name: Install dependencies
153-
run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
153+
run: sudo apt update && sudo apt-get install clang-14 libusb-1.0.0-dev libgtk-4-dev rpm
154154
- name: make debug
155155
run: sudo make clean && make debug
156156
- name: make test
@@ -164,13 +164,13 @@ jobs:
164164
- name: sudo make uninstall
165165
run: sudo make uninstall && sudo make clean
166166

167-
job_linux_20_04_32_clang:
168-
name: ubuntu-20.04 clang 32-bit
169-
runs-on: ubuntu-20.04
167+
job_linux_22_04_32_clang:
168+
name: ubuntu-22.04 clang 32-bit
169+
runs-on: ubuntu-22.04
170170
steps:
171171
- uses: actions/checkout@v2
172172
- name: Install dependencies
173-
run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
173+
run: sudo apt update && sudo apt-get install clang-14 libusb-1.0.0-dev libgtk-4-dev rpm
174174
- name: Set compiler flags
175175
run: |
176176
CFLAGS="$CFLAGS -m32"
@@ -190,13 +190,13 @@ jobs:
190190
run: sudo make uninstall && sudo make clean
191191
# Linux MinGW cross compliation
192192

193-
# job_linux_20_04_cross:
194-
# name: ubuntu-20.04 mingw64
195-
# runs-on: ubuntu-20.04
193+
# job_linux_22_04_cross:
194+
# name: ubuntu-22.04 mingw64
195+
# runs-on: ubuntu-22.04
196196
# steps:
197197
# - uses: actions/checkout@v2
198198
# - name: Install dependencies
199-
# run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm mingw-w64
199+
# run: sudo apt-get install gcc-12 libusb-1.0.0-dev libgtk-4-dev rpm mingw-w64
200200
# - name: Building Release for Windows (x86-64) ...
201201
# run: sudo mkdir -p build-mingw && cd build-mingw && sudo cmake \
202202
# -DCMAKE_SYSTEM_NAME=Windows \

CHANGELOG.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Features:
1717
- Added chip-IDs for STM32G0B0/G0B1/G0C1/G050/G051/G061 ([#1140](https://github.com/stlink-org/stlink/pull/1140))
1818
- Added option byte info for STM32F411XX ([#1141](https://github.com/stlink-org/stlink/pull/1141))
1919
- Expanded and revised list of chips ([#1145](https://github.com/stlink-org/stlink/pull/1145), [#1164](https://github.com/stlink-org/stlink/pull/1164))
20-
- [STM32H72X/3X]: Added full access to all device memory ([#1158](https://github.com/stlink-org/stlink/pull/1158), [#1159](https://github.com/stlink-org/stlink/pull/1159))
20+
- STM32H72X/3X: Added full access to all device memory ([#1158](https://github.com/stlink-org/stlink/pull/1158), [#1159](https://github.com/stlink-org/stlink/pull/1159))
2121
- Added support for STM32WLEx ([#1173](https://github.com/stlink-org/stlink/pull/1173), [#1273](https://github.com/stlink-org/stlink/pull/1273))
2222
- Added support for STLINK-V3 devices with no MSD ([#1185](https://github.com/stlink-org/stlink/pull/1185))
2323
- Updated gdb-server.c to allow external memory access on STM32H73xx ([#1196](https://github.com/stlink-org/stlink/pull/1196), [#1197](https://github.com/stlink-org/stlink/pull/1197))
@@ -31,7 +31,7 @@ Features:
3131
Updates & changes:
3232

3333
- [refactoring] Moved chip-specific parameters into separate files ([#237](https://github.com/stlink-org/stlink/pull/237), [#1129](https://github.com/stlink-org/stlink/pull/1129))
34-
- [refactoring] General maintenance for code structure ([#903](https://github.com/stlink-org/stlink/pull/903), [#1090](https://github.com/stlink-org/stlink/pull/1090), [#1199](https://github.com/stlink-org/stlink/pull/1199), [#1212](https://github.com/stlink-org/stlink/pull/1212), [#1216](https://github.com/stlink-org/stlink/pull/1216))
34+
- [refactoring] General maintenance for code structure ([#903](https://github.com/stlink-org/stlink/pull/903), [#1090](https://github.com/stlink-org/stlink/pull/1090), [#1199](https://github.com/stlink-org/stlink/pull/1199), [#1212](https://github.com/stlink-org/stlink/pull/1212), [#1216](https://github.com/stlink-org/stlink/pull/1216), [#1228](https://github.com/stlink-org/stlink/pull/1228))
3535
- Added instructions for bug-reports and feature-requests to contribution guidelines ([#906](https://github.com/stlink-org/stlink/pull/906))
3636
- Added travis CI configuration for macOS 10.14 to maintain capability for 32-bit compilation (commit [#f5ada94](https://github.com/stlink-org/stlink/commit/f5ada9474cdb87ff37de0d4eb9e75622b5870646))
3737
- Updated description of chip id 0x0457 to L01x/L02x ([#1143](https://github.com/stlink-org/stlink/pull/1143), [#1144](https://github.com/stlink-org/stlink/pull/1144))
@@ -44,14 +44,17 @@ Updates & changes:
4444
- [refactoring] Sourcefile 'common.c' ([#1218](https://github.com/stlink-org/stlink/pull/1218), [#1220](https://github.com/stlink-org/stlink/pull/1220))
4545
- Set C standard through cmake variables ([#1221](https://github.com/stlink-org/stlink/pull/1221))
4646
- [doc] Added make install to the macOS compiling instructions ([#1259](https://github.com/stlink-org/stlink/pull/1259))
47-
- [doc] Linux Install from code Documentation improvement ([#1263](https://github.com/stlink-org/stlink/pull/1263), (commit [#43498de](https://github.com/stlink-org/stlink/commit/43498dedf651260ef34197e512d35e3ad7142401))
47+
- [doc] Linux Install from code Documentation improvement ([#1263](https://github.com/stlink-org/stlink/pull/1263), commit [#43498de](https://github.com/stlink-org/stlink/commit/43498dedf651260ef34197e512d35e3ad7142401))
48+
- End of support for macOS ([#1269](https://github.com/stlink-org/stlink/pull/1269), [#1296](https://github.com/stlink-org/stlink/pull/1296), commit [#61ff09e](https://github.com/stlink-org/stlink/commit/61ff09e5274d46a46ae58bc4ffe44fe90a887ea6))
49+
- [doc] Added device ID for GD32F303VET6 ([#1288](https://github.com/stlink-org/stlink/pull/1288))
4850

4951
Fixes:
52+
5053
- cmake: Install shared libraries in proper directories ([#1098](https://github.com/stlink-org/stlink/pull/1098), [#1138](https://github.com/stlink-org/stlink/pull/1138), [#1154](https://github.com/stlink-org/stlink/pull/1154))
5154
- cmake: Install shared libraries in proper directories ([#1142](https://github.com/stlink-org/stlink/pull/1142))
5255
- Fixed clearance of the H7 dual bank flag ([#1146](https://github.com/stlink-org/stlink/pull/1146), [#1147](https://github.com/stlink-org/stlink/pull/1147))
5356
- Fix for 'libusb_devices were leaked' when no ST-LINK programmer was found ([#1150](https://github.com/stlink-org/stlink/pull/1150))
54-
- Set of fixes and improvements ([#1154](https://github.com/stlink-org/stlink/pull/1154))
57+
- Set of fixes and improvements ([#1153](https://github.com/stlink-org/stlink/pull/1153), [#1154](https://github.com/stlink-org/stlink/pull/1154))
5558
- Removed limit check for WRITEMEM_32BIT ([#1157](https://github.com/stlink-org/stlink/pull/1157))
5659
- Fixed get_stm32l0_flash_base address for STM32L152RE ([#1161](https://github.com/stlink-org/stlink/pull/1161), [#1162](https://github.com/stlink-org/stlink/pull/1162))
5760
- Fixed segfault if chip was not found in chip config files ([#1138](https://github.com/stlink-org/stlink/pull/1138), [#1163](https://github.com/stlink-org/stlink/pull/1163), [#1165](https://github.com/stlink-org/stlink/pull/1165), [#1166](https://github.com/stlink-org/stlink/pull/1166), [#1170](https://github.com/stlink-org/stlink/pull/1170))
@@ -64,13 +67,15 @@ Fixes:
6467
- Define 'SSIZE_MAX' if not defined ([#1183](https://github.com/stlink-org/stlink/pull/1183))
6568
- Fixed compliation for OpenBSD 7.0 ([#1202](https://github.com/stlink-org/stlink/pull/1202))
6669
- Included 'SSIZE_MAX' from 'limits.h' in 'src/common.c' ([#1207](https://github.com/stlink-org/stlink/pull/1207))
67-
- Fix for libusb_kernel_driver_active & error handling for st.st_size () ([#1210](https://github.com/stlink-org/stlink/pull/1210), [#1211](https://github.com/stlink-org/stlink/pull/1211), [#1214](https://github.com/stlink-org/stlink/pull/1214)
68-
- st-trace: Fixed clock issues ([#1251](https://github.com/stlink-org/stlink/pull/1251), [#1252](https://github.com/stlink-org/stlink/pull/1252))
70+
- Fix for libusb_kernel_driver_active & error handling for st.st_size () ([#1210](https://github.com/stlink-org/stlink/pull/1210), [#1211](https://github.com/stlink-org/stlink/pull/1211), [#1214](https://github.com/stlink-org/stlink/pull/1214))
71+
- General fixes and improvements ([#1240](https://github.com/stlink-org/stlink/pull/1240), [#1242](https://github.com/stlink-org/stlink/pull/1242), [#1290](https://github.com/stlink-org/stlink/pull/1290), [#1291](https://github.com/stlink-org/stlink/pull/1291), [#1295](https://github.com/stlink-org/stlink/pull/1295))
72+
- Fixes for project compilation ([#1241](https://github.com/stlink-org/stlink/pull/1241), [#1271](https://github.com/stlink-org/stlink/pull/1271), [#1283](https://github.com/stlink-org/stlink/pull/1283), [#1286](https://github.com/stlink-org/stlink/pull/1286),commit [#f93adb9](https://github.com/stlink-org/stlink/commit/f93adb92f2e4ecf05a9361cb723c98693586929d))
73+
- st-trace: Fixed clock issues ([#1248](https://github.com/stlink-org/stlink/pull/1248), [#1251](https://github.com/stlink-org/stlink/pull/1251), [#1252](https://github.com/stlink-org/stlink/pull/1252))
6974
- Fixed compilation with gcc-12 ([#1257](https://github.com/stlink-org/stlink/pull/1257), [#1267](https://github.com/stlink-org/stlink/pull/1267))
7075
- Fixed flash regs addr for STM32L152RET6 in common_flash.c ([#1265](https://github.com/stlink-org/stlink/pull/1265))
7176
- Fixed flash, dbgmcu and rcc registers for STM32L1 ([#1266](https://github.com/stlink-org/stlink/pull/1266))
72-
- Fixed compilation with gcc-12 ([#1257](https://github.com/stlink-org/stlink/pull/1257), [#1267](https://github.com/stlink-org/stlink/pull/1267))
73-
- Fixes for project compilation ([#1270](https://github.com/stlink-org/stlink/pull/1270), [#1271](https://github.com/stlink-org/stlink/pull/1271), [#1283](https://github.com/stlink-org/stlink/pull/1283), [#1286](https://github.com/stlink-org/stlink/pull/1286),commit [#f93adb9](https://github.com/stlink-org/stlink/commit/f93adb92f2e4ecf05a9361cb723c98693586929d))
77+
- Fixed incorrect SRAM size for L496x and L4A6x ([#1268](https://github.com/stlink-org/stlink/pull/1268), commit [#ff81148](https://github.com/stlink-org/stlink/commit/ff8114895a9fc32cae6a9374e58eac6256d68183))
78+
- Fixed st-trace reconnect on Windows ([#1272](https://github.com/stlink-org/stlink/pull/1272), [#1292](https://github.com/stlink-org/stlink/pull/1292))
7479
- [compilation] Corrected path to stlink/chips subdirectory ([#1276](https://github.com/stlink-org/stlink/pull/1276), [#1279](https://github.com/stlink-org/stlink/pull/1279))
7580
- [compilation] Fixed GUI compilation failure on OpenBSD i386 ([#1284](https://github.com/stlink-org/stlink/pull/1284))
7681

@@ -84,7 +89,7 @@ Features:
8489

8590
- Extended set of cmd line arguments for st-info and st-util ([#332](https://github.com/stlink-org/stlink/pull/332), [#990](https://github.com/stlink-org/stlink/pull/990), [#1091](https://github.com/stlink-org/stlink/pull/1091), [#1114](https://github.com/stlink-org/stlink/pull/1114))
8691
- Extended support for STM32H7 & rework of software reset ([#532](https://github.com/stlink-org/stlink/pull/532), [#801](https://github.com/stlink-org/stlink/pull/801), [#868](https://github.com/stlink-org/stlink/pull/868), [#1008](https://github.com/stlink-org/stlink/pull/1008), [#1059](https://github.com/stlink-org/stlink/pull/1059), [#1063](https://github.com/stlink-org/stlink/pull/1063), [#1071](https://github.com/stlink-org/stlink/pull/1071))
87-
- Added support for STM32H742/743/753 ([#671](https://github.com/stlink-org/stlink/pull/671), [#793](https://github.com/stlink-org/stlink/pull/793), [#823](https://github.com/stlink-org/stlink/pull/823), [#998](https://github.com/stlink-org/stlink/pull/998), [#1052](https://github.com/stlink-org/stlink/pull/1052))
92+
- Added support for STM32H742/743/753 ([#671](https://github.com/stlink-org/stlink/pull/671), [#793](https://github.com/stlink-org/stlink/pull/793), [#823](https://github.com/stlink-org/stlink/pull/823), [#998](https://github.com/stlink-org/stlink/pull/998), [#1052](https://github.com/stlink-org/stlink/pull/1052), [#1184](https://github.com/stlink-org/stlink/pull/1184))
8893
- Official support for STLINK-V3 programmers (commit [#5e0a502](https://github.com/stlink-org/stlink/commit/5e0a502df812495bfa96fa9116a19f1306152b17), [#820](https://github.com/stlink-org/stlink/pull/820), [#1022](https://github.com/stlink-org/stlink/pull/1022), [#1025](https://github.com/stlink-org/stlink/pull/1025))
8994
- Added preliminary support for STM32L5x2 ([#904](https://github.com/stlink-org/stlink/pull/904), [#999](https://github.com/stlink-org/stlink/pull/999))
9095
- Option bytes on the STM32F767 ZIT6 Nucleo-144 ([#968](https://github.com/stlink-org/stlink/pull/968), [#997](https://github.com/stlink-org/stlink/pull/997))

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ include(GNUInstallDirs) # Define GNU standard installation directories
7878
cmake_host_system_information(RESULT OS_NAME QUERY OS_NAME)
7979
message(STATUS "Checking for OS_NAME: ${OS_NAME}")
8080

81-
message(STATUS "set(CMAKE_INSTALL_SHAREDIR /usr/share)")
82-
set(CMAKE_INSTALL_SHAREDIR /usr/share/)
81+
message(STATUS "set(CMAKE_INSTALL_SHAREDIR /usr/local/share)")
82+
set(CMAKE_INSTALL_SHAREDIR /usr/local/share/)
8383

8484

8585
## Set C build flags

cmake/packaging/cpack_config.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ elseif (EXISTS "/etc/debian_version" AND NOT EXISTS WIN32) # Package-build is av
4848
set(CPACK_DEBIAN_PACKAGE_RELEASE "1")
4949

5050
# CPACK_DEBIAN_PACKAGE_ARCHITECTURE --> Default: Output of dpkg --print-architecture
51-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "pkg-config, build-essential, debhelper (>=9), cmake (>= 3.10.2), libusb-1.0-0-dev (>= 1.0.21)")
51+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "pkg-config, build-essential, debhelper (>=9), cmake (>= 3.13.0), libusb-1.0-0-dev (>= 1.0.22)")
5252
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Nightwalker-87 <stlink-org>")
5353
# CPACK_DEBIAN_PACKAGE_DESCRIPTION --> Default: CPACK_DEBIAN_PACKAGE_DESCRIPTION (as it is set)
5454
# CPACK_DEBIAN_PACKAGE_SECTION --> Default: “devel”

cmake/packaging/deb/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Source: stlink
22
Priority: optional
33
Maintainer: Nightwalker-87 <stlink-org>
4-
Build-Depends: cmake (>= 3.10.2), dh-cmake, debhelper (>= 9), libusb-1.0-0-dev (>= 1.0.21), libgtk-3-dev (>= 3.22.30)
4+
Build-Depends: cmake (>= 3.13.0), dh-cmake, debhelper (>= 9), libusb-1.0-0-dev (>= 1.0.22), libgtk-3-dev (>= 3.22.30)
55
Standards-Version: 4.6.2
66
Rules-Requires-Root: no
77
Section: electronics

config/chips/F401xD_xE.chip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ flash_pagesize 0x4000 // 16 KB
99
sram_size 0x18000 // 96 KB
1010
bootrom_base 0x1fff0000
1111
bootrom_size 0x7800 // 30 KB
12-
option_base 0x40023C14
13-
option_size 0x4
12+
option_base 0x40023C14 // STM32_F4_OPTION_BYTES_BASE
13+
option_size 0x4 // 4 B
1414
flags swo

config/chips/F446.chip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ sram_size 0x20000 // 128 KB
1010
bootrom_base 0x1fff0000
1111
bootrom_size 0x7800 // 30 KB
1212
option_base 0x40023c14 // STM32_F4_OPTION_BYTES_BASE
13-
option_size 0x4 // 4 B
13+
option_size 0x10 // 16 B
1414
flags swo

config/chips/G03x_G04x.chip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ sram_size 0x2000 // 8 KB
1010
bootrom_base 0x1fff0000
1111
bootrom_size 0x2000 // 8 KB
1212
option_base 0x1fff7800 // STM32_G0_OPTION_BYTES_BASE
13-
option_size 0x4 // 4 B
13+
option_size 0x80 // 128 B
1414
flags none

config/chips/G05x_G06x.chip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Chip-ID file for STM32G05x / STM32G06x device
22
#
33
dev_type STM32G05x_G06x
4-
ref_manual_id 0444
4+
ref_manual_id 0444 // also RM454
55
chip_id 0x456 // STM32_CHIPID_G0_CAT4
66
flash_type G0
77
flash_size_reg 0x1fff75e0
88
flash_pagesize 0x800 // 2 KB
9-
sram_size 0x9000 // 36 KB
9+
sram_size 0x4800 // 18 KB
1010
bootrom_base 0x1fff0000
1111
bootrom_size 0x7000 // 28 KB
1212
option_base 0x1fff7800 // STM32_G0_OPTION_BYTES_BASE
13-
option_size 0x4 // 4 B
13+
option_size 0x80 // 128 B
1414
flags none

config/chips/G07x_G08x.chip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Chip-ID file for STM32G07x / STM32G08x device
22
#
33
dev_type STM32G07x_G08x
4-
ref_manual_id 0444
4+
ref_manual_id 0444 // also RM454
55
chip_id 0x460 // STM32_CHIPID_G0_CAT2
66
flash_type G0
77
flash_size_reg 0x1fff75e0
@@ -10,5 +10,5 @@ sram_size 0x9000 // 36 KB
1010
bootrom_base 0x1fff0000
1111
bootrom_size 0x7000 // 28 KB
1212
option_base 0x1fff7800 // STM32_G0_OPTION_BYTES_BASE
13-
option_size 0x4 // 4 B
13+
option_size 0x80 // 128 B
1414
flags none

0 commit comments

Comments
 (0)