Merge pull request #1300 from stlink-org/f2023_1

Initial support for STM32 L5 & U5 devices and minor changes
stlink-org · Apr 6, 2023 · 8da1ae8 · 8da1ae8
2 parents c721751 + 982408e
commit 8da1ae8
Show file tree

Hide file tree

Showing 26 changed files with 609 additions and 577 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -9,13 +9,13 @@ on:
 jobs:
   # Linux
 
-  job_linux_18_04_64_gcc:
-    name: ubuntu-18.04 gcc
-    runs-on: ubuntu-18.04
+  job_linux_20_04_64_gcc:
+    name: ubuntu-20.04 gcc
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: install dependencies
-        run: sudo apt update && sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Install dependencies
+        run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: make debug
         run: sudo make clean && make debug
       - name: make test
@@ -29,13 +29,13 @@ jobs:
       - name: sudo make uninstall
         run: sudo make uninstall && sudo make clean
 
-  job_linux_18_04_32_gcc:
-    name: ubuntu-18.04 gcc 32-bit
-    runs-on: ubuntu-18.04
+  job_linux_20_04_32_gcc:
+    name: ubuntu-20.04 gcc 32-bit
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: install dependencies
-        run: sudo apt update && sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Install dependencies
+        run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: Set compiler flags
         run: |
           CFLAGS="$CFLAGS -m32"
@@ -54,13 +54,13 @@ jobs:
       - name: sudo make uninstall
         run: sudo make uninstall && sudo make clean
 
-  job_linux_18_04_64_clang:
-    name: ubuntu-18.04 clang
-    runs-on: ubuntu-18.04
+  job_linux_20_04_64_clang:
+    name: ubuntu-20.04 clang
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: install dependencies
-        run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Install dependencies
+        run: sudo apt update && sudo apt-get install clang-12 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: make debug
         run: sudo make clean && make debug
       - name: make test
@@ -74,13 +74,13 @@ jobs:
       - name: sudo make uninstall
         run: sudo make uninstall && sudo make clean
 
-  job_linux_18_04_32_clang:
-    name: ubuntu-18.04 clang 32-bit
-    runs-on: ubuntu-18.04
+  job_linux_20_04_32_clang:
+    name: ubuntu-20.04 clang 32-bit
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
+        run: sudo apt update && sudo apt-get install clang-12 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: Set compiler flags
         run: |
           CFLAGS="$CFLAGS -m32"
@@ -99,13 +99,13 @@ jobs:
       - name: sudo make uninstall
         run: sudo make uninstall && sudo make clean
 
-  job_linux_20_04_64_gcc:
-    name: ubuntu-20.04 gcc
-    runs-on: ubuntu-20.04
+  job_linux_22_04_64_gcc:
+    name: ubuntu-22.04 gcc
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
+        run: sudo apt update && sudo apt-get install gcc-12 libusb-1.0.0-dev libgtk-4-dev rpm
       - name: make debug
         run: sudo make clean && make debug
       - name: make test
@@ -119,13 +119,13 @@ jobs:
       - name: sudo make uninstall
         run: sudo make uninstall && sudo make clean
 
-  job_linux_20_04_32_gcc:
-    name: ubuntu-20.04 gcc 32-bit
-    runs-on: ubuntu-20.04
+  job_linux_22_04_32_gcc:
+    name: ubuntu-22.04 gcc 32-bit
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
+        run: sudo apt update && sudo apt-get install gcc-12 libusb-1.0.0-dev libgtk-4-dev rpm
       - name: Set compiler flags
         run: |
           CFLAGS="$CFLAGS -m32"
@@ -144,13 +144,13 @@ jobs:
       - name: sudo make uninstall
         run: sudo make uninstall && sudo make clean
 
-  job_linux_20_04_64_clang:
-    name: ubuntu-20.04 clang
-    runs-on: ubuntu-20.04
+  job_linux_22_04_64_clang:
+    name: ubuntu-22.04 clang
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
+        run: sudo apt update && sudo apt-get install clang-14 libusb-1.0.0-dev libgtk-4-dev rpm
       - name: make debug
         run: sudo make clean && make debug
       - name: make test
@@ -164,13 +164,13 @@ jobs:
       - name: sudo make uninstall
         run: sudo make uninstall && sudo make clean
 
-  job_linux_20_04_32_clang:
-    name: ubuntu-20.04 clang 32-bit
-    runs-on: ubuntu-20.04
+  job_linux_22_04_32_clang:
+    name: ubuntu-22.04 clang 32-bit
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
+        run: sudo apt update && sudo apt-get install clang-14 libusb-1.0.0-dev libgtk-4-dev rpm
       - name: Set compiler flags
         run: |
           CFLAGS="$CFLAGS -m32"
@@ -190,13 +190,13 @@ jobs:
         run: sudo make uninstall && sudo make clean
 # Linux MinGW cross compliation
 
-# job_linux_20_04_cross:
-#   name: ubuntu-20.04 mingw64
-#   runs-on: ubuntu-20.04
+# job_linux_22_04_cross:
+#   name: ubuntu-22.04 mingw64
+#   runs-on: ubuntu-22.04
 #   steps:
 #     - uses: actions/checkout@v2
 #     - name: Install dependencies
-#       run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm mingw-w64
+#       run: sudo apt-get install gcc-12 libusb-1.0.0-dev libgtk-4-dev rpm mingw-w64
 #     - name: Building Release for Windows (x86-64) ...
 #       run: sudo mkdir -p build-mingw && cd build-mingw && sudo cmake \
 #         -DCMAKE_SYSTEM_NAME=Windows \

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,7 @@ Features:
 - Added chip-IDs for STM32G0B0/G0B1/G0C1/G050/G051/G061 ([#1140](https://github.com/stlink-org/stlink/pull/1140))
 - Added option byte info for STM32F411XX ([#1141](https://github.com/stlink-org/stlink/pull/1141))
 - Expanded and revised list of chips ([#1145](https://github.com/stlink-org/stlink/pull/1145), [#1164](https://github.com/stlink-org/stlink/pull/1164))
-- [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))
+- 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))
 - Added support for STM32WLEx ([#1173](https://github.com/stlink-org/stlink/pull/1173), [#1273](https://github.com/stlink-org/stlink/pull/1273))
 - Added support for STLINK-V3 devices with no MSD ([#1185](https://github.com/stlink-org/stlink/pull/1185))
 - 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:
 Updates & changes:
 
 - [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))
-- [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))
+- [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))
 - Added instructions for bug-reports and feature-requests to contribution guidelines ([#906](https://github.com/stlink-org/stlink/pull/906))
 - 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))
 - 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:
 - [refactoring] Sourcefile 'common.c' ([#1218](https://github.com/stlink-org/stlink/pull/1218), [#1220](https://github.com/stlink-org/stlink/pull/1220))
 - Set C standard through cmake variables ([#1221](https://github.com/stlink-org/stlink/pull/1221))
 - [doc] Added make install to the macOS compiling instructions ([#1259](https://github.com/stlink-org/stlink/pull/1259))
-- [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))
+- [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))
+- 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))
+- [doc] Added device ID for GD32F303VET6 ([#1288](https://github.com/stlink-org/stlink/pull/1288))
 
 Fixes:
+
 - 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))
 - cmake: Install shared libraries in proper directories ([#1142](https://github.com/stlink-org/stlink/pull/1142))
 - 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))
 - Fix for 'libusb_devices were leaked' when no ST-LINK programmer was found ([#1150](https://github.com/stlink-org/stlink/pull/1150))
-- Set of fixes and improvements ([#1154](https://github.com/stlink-org/stlink/pull/1154))
+- Set of fixes and improvements ([#1153](https://github.com/stlink-org/stlink/pull/1153), [#1154](https://github.com/stlink-org/stlink/pull/1154))
 - Removed limit check for WRITEMEM_32BIT ([#1157](https://github.com/stlink-org/stlink/pull/1157))
 - 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))
 - 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:
 - Define 'SSIZE_MAX' if not defined ([#1183](https://github.com/stlink-org/stlink/pull/1183))
 - Fixed compliation for OpenBSD 7.0 ([#1202](https://github.com/stlink-org/stlink/pull/1202))
 - Included 'SSIZE_MAX' from 'limits.h' in 'src/common.c' ([#1207](https://github.com/stlink-org/stlink/pull/1207))
-- 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)
-- st-trace: Fixed clock issues ([#1251](https://github.com/stlink-org/stlink/pull/1251), [#1252](https://github.com/stlink-org/stlink/pull/1252))
+- 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))
+- 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))
+- 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))
+- 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))
 - Fixed compilation with gcc-12 ([#1257](https://github.com/stlink-org/stlink/pull/1257), [#1267](https://github.com/stlink-org/stlink/pull/1267))
 - Fixed flash regs addr for STM32L152RET6 in common_flash.c ([#1265](https://github.com/stlink-org/stlink/pull/1265))
 - Fixed flash, dbgmcu and rcc registers for STM32L1 ([#1266](https://github.com/stlink-org/stlink/pull/1266))
-- Fixed compilation with gcc-12 ([#1257](https://github.com/stlink-org/stlink/pull/1257), [#1267](https://github.com/stlink-org/stlink/pull/1267))
-- 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))
+- 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))
+- Fixed st-trace reconnect on Windows ([#1272](https://github.com/stlink-org/stlink/pull/1272), [#1292](https://github.com/stlink-org/stlink/pull/1292))
 - [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))
 - [compilation] Fixed GUI compilation failure on OpenBSD i386 ([#1284](https://github.com/stlink-org/stlink/pull/1284))
 
@@ -84,7 +89,7 @@ Features:
 
 - 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))
 - 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))
-- 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))
+- 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))
 - 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))
 - Added preliminary support for STM32L5x2 ([#904](https://github.com/stlink-org/stlink/pull/904), [#999](https://github.com/stlink-org/stlink/pull/999))
 - 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))

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -78,8 +78,8 @@ include(GNUInstallDirs) # Define GNU standard installation directories
 cmake_host_system_information(RESULT OS_NAME QUERY OS_NAME)
 message(STATUS "Checking for OS_NAME: ${OS_NAME}")
 
-message(STATUS "set(CMAKE_INSTALL_SHAREDIR /usr/share)")
-set(CMAKE_INSTALL_SHAREDIR /usr/share/)
+message(STATUS "set(CMAKE_INSTALL_SHAREDIR /usr/local/share)")
+set(CMAKE_INSTALL_SHAREDIR /usr/local/share/)
 
 
 ## Set C build flags

diff --git a/cmake/packaging/cpack_config.cmake b/cmake/packaging/cpack_config.cmake
@@ -48,7 +48,7 @@ elseif (EXISTS "/etc/debian_version" AND NOT EXISTS WIN32) # Package-build is av
     set(CPACK_DEBIAN_PACKAGE_RELEASE "1")
 
     # CPACK_DEBIAN_PACKAGE_ARCHITECTURE  --> Default: Output of dpkg --print-architecture
-    set(CPACK_DEBIAN_PACKAGE_DEPENDS "pkg-config, build-essential, debhelper (>=9), cmake (>= 3.10.2), libusb-1.0-0-dev (>= 1.0.21)")
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS "pkg-config, build-essential, debhelper (>=9), cmake (>= 3.13.0), libusb-1.0-0-dev (>= 1.0.22)")
     set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Nightwalker-87 <stlink-org>")
     # CPACK_DEBIAN_PACKAGE_DESCRIPTION   --> Default: CPACK_DEBIAN_PACKAGE_DESCRIPTION (as it is set)
     # CPACK_DEBIAN_PACKAGE_SECTION       --> Default: “devel”

diff --git a/cmake/packaging/deb/control b/cmake/packaging/deb/control
@@ -1,7 +1,7 @@
 Source: stlink
 Priority: optional
 Maintainer: Nightwalker-87 <stlink-org>
-Build-Depends: cmake (>= 3.10.2), dh-cmake, debhelper (>= 9), libusb-1.0-0-dev (>= 1.0.21), libgtk-3-dev (>= 3.22.30)
+Build-Depends: cmake (>= 3.13.0), dh-cmake, debhelper (>= 9), libusb-1.0-0-dev (>= 1.0.22), libgtk-3-dev (>= 3.22.30)
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Section: electronics

diff --git a/config/chips/F401xD_xE.chip b/config/chips/F401xD_xE.chip
@@ -9,6 +9,6 @@ flash_pagesize 0x4000        // 16 KB
 sram_size 0x18000            // 96 KB
 bootrom_base 0x1fff0000
 bootrom_size 0x7800          // 30 KB
-option_base 0x40023C14
-option_size 0x4
+option_base 0x40023C14       // STM32_F4_OPTION_BYTES_BASE
+option_size 0x4              // 4 B
 flags swo
diff --git a/config/chips/F446.chip b/config/chips/F446.chip
@@ -10,5 +10,5 @@ sram_size 0x20000            // 128 KB
 bootrom_base 0x1fff0000
 bootrom_size 0x7800          // 30 KB
 option_base 0x40023c14       // STM32_F4_OPTION_BYTES_BASE
-option_size 0x4              // 4 B
+option_size 0x10             // 16 B
 flags swo
diff --git a/config/chips/G03x_G04x.chip b/config/chips/G03x_G04x.chip
@@ -10,5 +10,5 @@ sram_size 0x2000             // 8 KB
 bootrom_base 0x1fff0000
 bootrom_size 0x2000          // 8 KB
 option_base 0x1fff7800       // STM32_G0_OPTION_BYTES_BASE
-option_size 0x4              // 4 B
+option_size 0x80             // 128 B
 flags none
diff --git a/config/chips/G05x_G06x.chip b/config/chips/G05x_G06x.chip
@@ -1,14 +1,14 @@
 # Chip-ID file for STM32G05x / STM32G06x device
 #
 dev_type STM32G05x_G06x
-ref_manual_id 0444
+ref_manual_id 0444           // also RM454
 chip_id 0x456                // STM32_CHIPID_G0_CAT4
 flash_type G0
 flash_size_reg 0x1fff75e0
 flash_pagesize 0x800         // 2 KB
-sram_size 0x9000             // 36 KB
+sram_size 0x4800             // 18 KB
 bootrom_base 0x1fff0000
 bootrom_size 0x7000          // 28 KB
 option_base 0x1fff7800       // STM32_G0_OPTION_BYTES_BASE
-option_size 0x4              // 4 B
+option_size 0x80             // 128 B
 flags none
diff --git a/config/chips/G07x_G08x.chip b/config/chips/G07x_G08x.chip
@@ -1,7 +1,7 @@
 # Chip-ID file for STM32G07x / STM32G08x device
 #
 dev_type STM32G07x_G08x
-ref_manual_id 0444
+ref_manual_id 0444           // also RM454
 chip_id 0x460                // STM32_CHIPID_G0_CAT2
 flash_type G0
 flash_size_reg 0x1fff75e0
@@ -10,5 +10,5 @@ sram_size 0x9000             // 36 KB
 bootrom_base 0x1fff0000
 bootrom_size 0x7000          // 28 KB
 option_base 0x1fff7800       // STM32_G0_OPTION_BYTES_BASE
-option_size 0x4              // 4 B
+option_size 0x80             // 128 B
 flags none