Merge pull request #1332 from stlink-org/testing

Merge branch `testing` into `develop`
stlink-org · Sep 16, 2023 · 956d654 · 956d654
2 parents f3fcaf2 + a0c0216
commit 956d654
Show file tree

Hide file tree

Showing 40 changed files with 529 additions and 603 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,7 @@ Updates & changes:
 - [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))
+- [refactoring] Clean code with unified variable type ([#909](https://github.com/stlink-org/stlink/pull/909), commit [#5e85fd0](https://github.com/stlink-org/stlink/commit/5e85fd063908f89499180c28fe5e9ba74868b272))
 - 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))
 - [doc] Human-readable flash_type in chip-id files ([#1155](https://github.com/stlink-org/stlink/pull/1155), commit [#1745bf5](https://github.com/stlink-org/stlink/commit/1745bf5193c4d3186d4f6fde59cc86e9bad6e61b))
 - Dropped execute bits from source code files ([#1167](https://github.com/stlink-org/stlink/pull/1167))
@@ -51,9 +52,13 @@ Updates & changes:
 - [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))
+- [doc] Fixed broken links ([#1312](https://github.com/stlink-org/stlink/pull/1312))
+- [doc] Updated package source link for Arch Linux ([#1318](https://github.com/stlink-org/stlink/pull/1318))
+- CMake: Avoid hard-wired /usr/local/share ([#1325](https://github.com/stlink-org/stlink/pull/1325))
 
 Fixes:
 
+- Fixed some flashing issues on STM32L0 ([#681](https://github.com/stlink-org/stlink/pull/681), [#1203](https://github.com/stlink-org/stlink/pull/1203), [#1225](https://github.com/stlink-org/stlink/pull/1225), [#1253](https://github.com/stlink-org/stlink/pull/1253), [#1289](https://github.com/stlink-org/stlink/pull/1289), [#1330](https://github.com/stlink-org/stlink/pull/1330))
 - 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))
@@ -84,9 +89,11 @@ Fixes:
 - 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))
+- [STM32U5x5]: Last bytes are not written (flashed) when len(<binary>)%16 <= 8 ([#1303](https://github.com/stlink-org/stlink/pull/1303), [#1315](https://github.com/stlink-org/stlink/pull/1315))
 - Fixed unbounded write and check return values of sscanf ([#1306](https://github.com/stlink-org/stlink/pull/1306))
 - Added null check for return value of stlink_chipid_get_params() ([#1307](https://github.com/stlink-org/stlink/pull/1307))
 - Fixed warning in a few *.cmake files ([#1309](https://github.com/stlink-org/stlink/pull/1309))
+- Notification "unknown option -- u" in tool st-util ([#1326](https://github.com/stlink-org/stlink/pull/1326), [#1327](https://github.com/stlink-org/stlink/pull/1327))
 
 # v1.7.0
 
@@ -98,7 +105,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), [#1184](https://github.com/stlink-org/stlink/pull/1184))
+- 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), [#1324](https://github.com/stlink-org/stlink/pull/1324))
 - 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
@@ -88,7 +88,7 @@ else ()
     set(CMAKE_C_FLAGS_MINSIZEREL_INIT     "/MT /O1 /Ob1 /D NDEBUG")
     set(CMAKE_C_FLAGS_RELEASE_INIT        "/MT /O2 /Ob2 /D NDEBUG")
     set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1 /D NDEBUG")
-endif ()
+endif()
 
 
 ###
@@ -108,10 +108,10 @@ if (_stack_chk_fail_exists)
         set(SSP_LIB -static ssp)
     else ()
         set(SSP_LIB ssp)
-    endif ()
+    endif()
 else ()
     set(SSP_LIB "")
-endif ()
+endif()
 
 CHECK_INCLUDE_FILE(sys/mman.h STLINK_HAVE_SYS_MMAN_H)
 if (STLINK_HAVE_SYS_MMAN_H)
@@ -126,17 +126,17 @@ endif()
 CHECK_INCLUDE_FILE(unistd.h STLINK_HAVE_UNISTD_H)
 if (STLINK_HAVE_UNISTD_H)
     add_definitions(-DSTLINK_HAVE_UNISTD_H)
-endif ()
+endif()
 
 CHECK_INCLUDE_FILE(dirent.h STLINK_HAVE_DIRENT_H)
 if (STLINK_HAVE_DIRENT_H)
     add_definitions(-DSTLINK_HAVE_DIRENT_H)
-endif ()
+endif()
 
 if (MSVC)
     # Use string.h rather than strings.h and disable annoying warnings
     add_definitions(-DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS /wd4710)
-endif ()
+endif()
 
 
 ###
@@ -161,7 +161,7 @@ if (WIN32)
 set(STLINK_INCLUDE_PATH ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Main include install directory")
 else ()
 set(STLINK_INCLUDE_PATH ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} CACHE PATH "Main include install directory")
-endif ()
+endif()
 
 ## Subordinate CMakeLists for version config & header installation
 add_subdirectory(inc)
@@ -215,7 +215,7 @@ if (WIN32)
         # Add drop-in replacement for unistd.h to sources
         include_directories(src/win32/unistd)
         set(STLINK_HEADERS "${STLINK_HEADERS};src/win32/unistd/unistd.h")
-    endif ()
+    endif()
 
     if (NOT STLINK_HAVE_SYS_MMAN_H)
         include_directories(src/win32/mmap)
@@ -227,12 +227,12 @@ if (WIN32)
         set(STLINK_SOURCE "${STLINK_SOURCE};src/win32/sys_time.c")
         set(STLINK_HEADERS "${STLINK_HEADERS};src/win32/sys_time.h")
     endif()
-endif ()
+endif()
 
 ## Include test execution for test-targets for target Debug
 if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
     include(CTest)
-endif ()
+endif()
 
 
 ###
@@ -268,7 +268,7 @@ if (WIN32) # ... with Windows libraries
     target_link_libraries(${STLINK_LIB_SHARED} ${LIBUSB_LIBRARY} ${SSP_LIB} wsock32 ws2_32)
 else ()
     target_link_libraries(${STLINK_LIB_SHARED} ${LIBUSB_LIBRARY} ${SSP_LIB})
-endif ()
+endif()
 
 install(TARGETS ${STLINK_LIB_SHARED}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -282,7 +282,7 @@ file(COPY ${LIBUSB_WIN_OUTPUT_FOLDER}/MinGW64/dll/libusb-1.0.dll
      DESTINATION ${CMAKE_INSTALL_BINDIR})
 file(COPY ${LIBUSB_WIN_OUTPUT_FOLDER}/MinGW64/dll/libusb-1.0.dll
      DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})
-endif ()
+endif()
 
 
 ###
@@ -314,7 +314,7 @@ if (WIN32) # ... with Windows libraries
     target_link_libraries(${STLINK_LIB_STATIC} ${LIBUSB_LIBRARY} ${SSP_LIB} wsock32 ws2_32)
 else ()
     target_link_libraries(${STLINK_LIB_STATIC} ${LIBUSB_LIBRARY} ${SSP_LIB})
-endif ()
+endif()
 
 install(TARGETS ${STLINK_LIB_STATIC} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
@@ -333,7 +333,7 @@ if (MSVC)
     include_directories(src/win32/getopt)
     set(ST-UTIL_SOURCES "${ST-UTIL_SOURCES};src/win32/getopt/getopt.c")
     set(ST-TRACE_SOURCES "${ST-TRACE_SOURCES};src/win32/getopt/getopt.c")
-endif ()
+endif()
 
 add_executable(st-flash ${ST-FLASH_SOURCES})
 add_executable(st-info ${ST-INFO_SOURCES})
@@ -350,7 +350,7 @@ else ()
     target_link_libraries(st-info ${STLINK_LIB_SHARED} ${SSP_LIB})
     target_link_libraries(st-util ${STLINK_LIB_SHARED} ${SSP_LIB})
     target_link_libraries(st-trace ${STLINK_LIB_SHARED} ${SSP_LIB})
-endif ()
+endif()
 
 install(TARGETS st-flash DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(TARGETS st-info DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -371,7 +371,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(STLINK_UDEV_RULES_DIR "/lib/udev/rules.d" CACHE PATH "udev rules directory")
     file(GLOB RULES_FILES ${CMAKE_SOURCE_DIR}/config/udev/rules.d/*.rules)
     install(FILES ${RULES_FILES} DESTINATION ${STLINK_UDEV_RULES_DIR})
-endif ()
+endif()
 
 
 ###
@@ -410,4 +410,4 @@ if (NOT TARGET uninstall)
         uninstall COMMAND ${CMAKE_COMMAND}
         -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake
         )
-endif ()
+endif()
diff --git a/README.md b/README.md
@@ -78,7 +78,12 @@ We recommend to install `stlink-tools` from the package repository of the used d
 - Alpine Linux: [(Link)](https://pkgs.alpinelinux.org/packages?name=stlink)
 - Fedora: [(Link)](https://src.fedoraproject.org/rpms/stlink)
 - FreeBSD: Users can install from [freshports](https://www.freshports.org/devel/stlink)
-- MacOS: **Support for macOS will end with v1.8.0.** Please use v1.7.0 (current ***master*** branch) and the related documentation instead.
+
+**macOS**:
+
+**Support for macOS will be dropped with v1.8.0.**
+
+Please use v1.7.0 instead, **but note that this version is no longer maintained and supported!**
 
 ## Installation from source (advanced users)
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -7,7 +7,7 @@ The following versions of the stlink toolset are currently being supported.<br /
 | Version | Supported          |
 | ------- | ------------------ |
 | develop | :white_check_mark: |
-| 1.7.x   | :white_check_mark: |
+| 1.7.0   | :x:                |
 | 1.6.x   | :x:                |
 | 1.5.x   | :x:                |
 | 1.4.0   | :x:                |

diff --git a/cmake/modules/Findlibusb.cmake b/cmake/modules/Findlibusb.cmake
@@ -24,7 +24,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")                  # FreeBSD; libusb is
     mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARY)
     if (NOT LIBUSB_FOUND)
         message(FATAL_ERROR "Expected libusb library not found on your system! Verify your system integrity.")
-    endif ()
+    endif()
 
 elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")              # OpenBSD; libusb-1.0 is available from ports
     FIND_PATH(
@@ -41,7 +41,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")              # OpenBSD; libusb-1.0
     mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARY)
     if (NOT LIBUSB_FOUND)
         message(FATAL_ERROR "No libusb-1.0 library found on your system! Install libusb-1.0 from ports or packages.")
-    endif ()
+    endif()
 
 elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW)) # Windows or MinGW-toolchain on Debian
     # MinGW/MSYS/MSVC: 64-bit or 32-bit?
@@ -51,7 +51,7 @@ elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW)) # Windows or MinGW-to
     else ()
         message(STATUS "=== Building for Windows (i686) ===")
         set(ARCH 32)
-    endif ()
+    endif()
 
     if (WIN32 AND NOT EXISTS "/etc/debian_version") # Skip this for Debian...
         # Preparations for installing libusb library
@@ -63,7 +63,7 @@ elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW)) # Windows or MinGW-to
         elseif (EXISTS "/etc/debian_version" AND MINGW)   # ... only for cross-building on Debian
             set(LIBUSB_WIN_ARCHIVE_PATH ${CMAKE_SOURCE_DIR}/build-mingw-${ARCH}/${LIBUSB_WIN_ARCHIVE})
             set(LIBUSB_WIN_OUTPUT_FOLDER ${CMAKE_SOURCE_DIR}/build-mingw-${ARCH}/3rdparty/libusb-${LIBUSB_WIN_VERSION})
-        endif ()
+        endif()
 
         # Get libusb package
         if (EXISTS ${LIBUSB_WIN_ARCHIVE_PATH})  # ... should the package be already there (for whatever reason)
@@ -74,7 +74,7 @@ elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW)) # Windows or MinGW-to
                 https://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-${LIBUSB_WIN_VERSION}/libusb-${LIBUSB_WIN_VERSION}.7z/download
                 ${LIBUSB_WIN_ARCHIVE_PATH} EXPECTED_MD5 aabe177bde869bfad34278335eaf8955
                 )
-        endif ()
+        endif()
 
         file(MAKE_DIRECTORY ${LIBUSB_WIN_OUTPUT_FOLDER})
 
@@ -110,9 +110,9 @@ elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW)) # Windows or MinGW-to
                 NO_DEFAULT_PATH
                 NO_CMAKE_FIND_ROOT_PATH
                 )
-        endif ()
+        endif()
         message(STATUS "Missing libusb library has been installed")
-    endif ()
+    endif()
     FIND_PACKAGE_HANDLE_STANDARD_ARGS(libusb DEFAULT_MSG LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR)
     mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARY)
 
@@ -132,5 +132,5 @@ else ()
 
     if (NOT LIBUSB_FOUND)
         message(FATAL_ERROR "libusb library not found on your system! Install libusb 1.0.x from your package repository.")
-    endif ()
-endif ()
+    endif()
+endif()
diff --git a/cmake/modules/c_flags.cmake b/cmake/modules/c_flags.cmake
@@ -14,7 +14,7 @@ function(add_cflag_if_supported flag)
 
     if (C_SUPPORTS${flagclean})
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}" PARENT_SCOPE)
-    endif ()
+    endif()
 endfunction()
 
 add_cflag_if_supported("-Wall")
@@ -38,14 +38,14 @@ add_cflag_if_supported("-Wimplicit-function-declaration")
 ##
 if (NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
     add_cflag_if_supported("-Wredundant-decls")
-endif ()
+endif()
 
 if (NOT (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW)))
     add_cflag_if_supported("-fPIC")
-endif ()
+endif()
 
 if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
     add_cflag_if_supported("-ggdb")
 else ()
     add_cflag_if_supported("-Werror")
-endif ()
+endif()
diff --git a/cmake/modules/get_version.cmake b/cmake/modules/get_version.cmake
@@ -28,7 +28,7 @@ if (GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
             )
         if (res EQUAL 1)
             set(PROJECT_VERSION "${PROJECT_VERSION}-dirty")
-        endif ()
+        endif()
 
         # Strip a leading v off of the version as proceeding code expects just the version numbering.
         string(REGEX REPLACE "^v" "" PROJECT_VERSION ${PROJECT_VERSION})
@@ -53,28 +53,28 @@ if (GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
                 # ...the version does not match with git-version string
                 if (NOT __version_str STREQUAL __version_file)
                     message(STATUS "Rewrite ${PROJECT_SOURCE_DIR}/.version with ${__version_str}!")
-                endif ()
+                endif()
 
             elseif (NOT EXISTS "${PROJECT_SOURCE_DIR}/.version")
 
                 # No local .version file found: Create a new one...
                 file(WRITE "${PROJECT_SOURCE_DIR}/.version" ${__version_str})
 
-            endif ()
+            endif()
 
             message(STATUS "stlink version: ${PROJECT_VERSION}")
             message(STATUS "Major ${PROJECT_VERSION_MAJOR} Minor ${PROJECT_VERSION_MINOR} Patch ${PROJECT_VERSION_PATCH}")
 
         else (len EQUAL 3)
             message(STATUS "Failed to extract version parts from \"${PROJECT_VERSION}\"")
             set(ERROR_FLAG "1")
-        endif (len EQUAL 3)
+        endif(len EQUAL 3)
 
     else (GIT_DESCRIBE_RESULT EQUAL 0)
         message(WARNING "git describe failed: ${GIT_DESCRIBE_ERROR}")
         set(ERROR_FLAG "1")
     endif(GIT_DESCRIBE_RESULT EQUAL 0)
-endif ()
+endif()
 
 ##
 # Failure to read version via git
@@ -101,9 +101,9 @@ if (NOT GIT_FOUND OR NOT EXISTS "${PROJECT_SOURCE_DIR}/.git" OR ERROR_FLAG EQUAL
             set(__detect_version 1)
         else ()
             message(STATUS "Fail to extract version parts from \"${PROJECT_VERSION}\"")
-        endif ()
+        endif()
     else (EXISTS ${PROJECT_SOURCE_DIR}/.version)
         message(STATUS "File \"${PROJECT_SOURCE_DIR}/.version\" does not exist.")
         message(FATAL_ERROR "Unable to determine project version")
-    endif ()
-endif ()
+    endif()
+endif()