General Project Update

- Formatting fixes
- Commented CI build setting for Ubuntu 16.04
- Updated CHANGELOG.md

.github/workflows/c-cpp.yml

@@ -7,98 +7,97 @@ on:
     branches: [master, develop, testing]
 
 jobs:
+  # Linux
 
-# Linux
-
-  job_linux_16_04_64_gcc:
-    name: ubuntu-16.04 gcc
-    runs-on: ubuntu-16.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: make debug
-        run: sudo make clean && make debug
-      - name: make test
-        run: sudo make clean && make test
-      - name: make release
-        run: sudo make clean && make release
-      - name: sudo make install
-        run: sudo make clean && sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall && sudo make clean
+  # job_linux_16_04_64_gcc:
+  #   name: ubuntu-16.04 gcc
+  #   runs-on: ubuntu-16.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: Install dependencies
+  #       run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
+  #     - name: make debug
+  #       run: sudo make clean && make debug
+  #     - name: make test
+  #       run: sudo make clean && make test
+  #     - name: make release
+  #       run: sudo make clean && make release
+  #     - name: sudo make install
+  #       run: sudo make clean && sudo make install
+  #     - name: sudo make package
+  #       run: sudo make package
+  #     - name: sudo make uninstall
+  #       run: sudo make uninstall && sudo make clean
 
-  job_linux_16_04_32_gcc:
-    name: ubuntu-16.04 gcc 32-bit
-    runs-on: ubuntu-16.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: Set compiler flags
-        run: |
-          CFLAGS="$CFLAGS -m32"
-          CXXFLAGS="$CXXFLAGS -m32"
-          LDFLAGS="$LDFLAGS -m32"
-      - name: make debug
-        run: sudo make clean && make debug
-      - name: make test
-        run: sudo make clean && make test
-      - name: make release
-        run: sudo make clean && make release
-      - name: sudo make install
-        run: sudo make clean && sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall && sudo make clean
+  # job_linux_16_04_32_gcc:
+  #   name: ubuntu-16.04 gcc 32-bit
+  #   runs-on: ubuntu-16.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: Install dependencies
+  #       run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
+  #     - name: Set compiler flags
+  #       run: |
+  #         CFLAGS="$CFLAGS -m32"
+  #         CXXFLAGS="$CXXFLAGS -m32"
+  #         LDFLAGS="$LDFLAGS -m32"
+  #     - name: make debug
+  #       run: sudo make clean && make debug
+  #     - name: make test
+  #       run: sudo make clean && make test
+  #     - name: make release
+  #       run: sudo make clean && make release
+  #     - name: sudo make install
+  #       run: sudo make clean && sudo make install
+  #     - name: sudo make package
+  #       run: sudo make package
+  #     - name: sudo make uninstall
+  #       run: sudo make uninstall && sudo make clean
 
-  job_linux_16_04_64_clang:
-    name: ubuntu-16.04 clang
-    runs-on: ubuntu-16.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: make debug
-        run: sudo make clean && make debug
-      - name: make test
-        run: sudo make clean && make test
-      - name: make release
-        run: sudo make clean && make release
-      - name: sudo make install
-        run: sudo make clean && sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall && sudo make clean
+  # job_linux_16_04_64_clang:
+  #   name: ubuntu-16.04 clang
+  #   runs-on: ubuntu-16.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: Install dependencies
+  #       run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
+  #     - name: make debug
+  #       run: sudo make clean && make debug
+  #     - name: make test
+  #       run: sudo make clean && make test
+  #     - name: make release
+  #       run: sudo make clean && make release
+  #     - name: sudo make install
+  #       run: sudo make clean && sudo make install
+  #     - name: sudo make package
+  #       run: sudo make package
+  #     - name: sudo make uninstall
+  #       run: sudo make uninstall && sudo make clean
 
-  job_linux_16_04_32_clang:
-    name: ubuntu-16.04 clang 32-bit
-    runs-on: ubuntu-16.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: Set compiler flags
-        run: |
-          CFLAGS="$CFLAGS -m32"
-          CXXFLAGS="$CXXFLAGS -m32"
-          LDFLAGS="$LDFLAGS -m32"
-      - name: make debug
-        run: sudo make clean && make debug
-      - name: make test
-        run: sudo make clean && make test
-      - name: make release
-        run: sudo make clean && make release
-      - name: sudo make install
-        run: sudo make clean && sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall && sudo make clean
+  # job_linux_16_04_32_clang:
+  #   name: ubuntu-16.04 clang 32-bit
+  #   runs-on: ubuntu-16.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: Install dependencies
+  #       run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
+  #     - name: Set compiler flags
+  #       run: |
+  #         CFLAGS="$CFLAGS -m32"
+  #         CXXFLAGS="$CXXFLAGS -m32"
+  #         LDFLAGS="$LDFLAGS -m32"
+  #     - name: make debug
+  #       run: sudo make clean && make debug
+  #     - name: make test
+  #       run: sudo make clean && make test
+  #     - name: make release
+  #       run: sudo make clean && make release
+  #     - name: sudo make install
+  #       run: sudo make clean && sudo make install
+  #     - name: sudo make package
+  #       run: sudo make package
+  #     - name: sudo make uninstall
+  #       run: sudo make uninstall && sudo make clean
 
   job_linux_18_04_64_gcc:
     name: ubuntu-18.04 gcc
@@ -144,7 +143,7 @@ jobs:
         run: sudo make package
       - 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
@@ -280,7 +279,7 @@ jobs:
       - name: sudo make uninstall
         run: sudo make uninstall && sudo make clean
 
-# macOS
+  # macOS
 
   # job_macos_10_14_64_gcc:
   #   name: macos-10.14 gcc
@@ -411,7 +410,6 @@ jobs:
         run: sudo make package
       - name: sudo make uninstall
         run: sudo make uninstall && sudo make clean
-
   # job_macos_11_gcc:
   #   name: macos-11.0 gcc
   #   runs-on: macos-11.0
@@ -431,7 +429,6 @@ jobs:
   #       run: sudo make package
   #     - name: sudo make uninstall
   #       run: sudo make uninstall && sudo make clean
-
   # job_macos_11_clang:
   #   name: macos-11.0 clang
   #   runs-on: macos-11.0
@@ -451,20 +448,19 @@ jobs:
   #       run: sudo make package
   #     - name: sudo make uninstall
   #       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
-  #   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
-  #     - name: Building Release for Windows (x86-64) ...
-  #       run: sudo mkdir -p build-mingw && cd build-mingw && sudo cmake \
-  #         -DCMAKE_SYSTEM_NAME=Windows \
-  #         -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
-  #         -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake \
-  #         -DCMAKE_INSTALL_PREFIX=$PWD/install $PWD && \
-  #         sudo make && sudo rm -rf build-mingw && cd -
+# job_linux_20_04_cross:
+#   name: ubuntu-20.04 mingw64
+#   runs-on: ubuntu-20.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
+#     - name: Building Release for Windows (x86-64) ...
+#       run: sudo mkdir -p build-mingw && cd build-mingw && sudo cmake \
+#         -DCMAKE_SYSTEM_NAME=Windows \
+#         -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
+#         -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake \
+#         -DCMAKE_INSTALL_PREFIX=$PWD/install $PWD && \
+#         sudo make && sudo rm -rf build-mingw && cd -

CHANGELOG.md

@@ -41,7 +41,7 @@ Updates & changes:
 Fixes:
 
 - Flash loader rework ([#356](https://github.com/stlink-org/stlink/pull/356), [#556](https://github.com/stlink-org/stlink/pull/556), [#593](https://github.com/stlink-org/stlink/pull/593), [#597](https://github.com/stlink-org/stlink/pull/597), [#607](https://github.com/stlink-org/stlink/pull/607), [#612](https://github.com/stlink-org/stlink/pull/612), [#638](https://github.com/stlink-org/stlink/pull/638), [#661](https://github.com/stlink-org/stlink/pull/661), [#690](https://github.com/stlink-org/stlink/pull/690), [#807](https://github.com/stlink-org/stlink/pull/807), [#817](https://github.com/stlink-org/stlink/pull/817), [#818](https://github.com/stlink-org/stlink/pull/818), [#854](https://github.com/stlink-org/stlink/pull/854), [#868](https://github.com/stlink-org/stlink/pull/868), [#967](https://github.com/stlink-org/stlink/pull/967), [#979](https://github.com/stlink-org/stlink/pull/979), [#1043](https://github.com/stlink-org/stlink/pull/1043), [#1054](https://github.com/stlink-org/stlink/pull/1054), [#1092](https://github.com/stlink-org/stlink/pull/1092), [#1105](https://github.com/stlink-org/stlink/pull/1105), [#1113](https://github.com/stlink-org/stlink/pull/1113))
-- Fixed old DFU serial number for STLINK programmers ([#417](https://github.com/stlink-org/stlink/pull/417), [#494](https://github.com/stlink-org/stlink/pull/494), [#1106](https://github.com/stlink-org/stlink/pull/1106))
+- Fixed old DFU serial number for STLINK programmers ([#417](https://github.com/stlink-org/stlink/pull/417), [#494](https://github.com/stlink-org/stlink/pull/494), [#1106](https://github.com/stlink-org/stlink/pull/1106), [#1121](https://github.com/stlink-org/stlink/pull/1121))
 - Use vl flashloader for all STM32F1 series ([#769](https://github.com/stlink-org/stlink/pull/769), [#1041](https://github.com/stlink-org/stlink/pull/1041), [#1044](https://github.com/stlink-org/stlink/pull/1044))
 - [regression] Changed timeout on flash write ([#787](https://github.com/stlink-org/stlink/pull/787), [#981](https://github.com/stlink-org/stlink/pull/981), [#987](https://github.com/stlink-org/stlink/pull/987))
 - cmake compile failure with external `CMAKE_MODULE_PATH` set ([#962](https://github.com/stlink-org/stlink/pull/962))
@@ -165,7 +165,7 @@ Fixes:
 - Set static link for `libssp` (stack-smashing protection) ([#960](https://github.com/stlink-org/stlink/pull/960), [#961](https://github.com/stlink-org/stlink/pull/961))
 - Fixed udev rules installing to wrong directory ([#966](https://github.com/stlink-org/stlink/pull/966))
 - Fixed formatting for options display in `st-flash` & `st-info` (commits [#c783d0e](https://github.com/stlink-org/stlink/commit/c783d0e777ccc83a7a8be26a4f4d3414e0478560) and [#562cd24](https://github.com/stlink-org/stlink/commit/562cd2496e696dbd22950925866aac662d81ee5f))
-- Fixed reading of chip ID on Cortex-M0+ core ([#1125](https://github.com/stlink-org/stlink/pull/1125), [#1126](https://github.com/stlink-org/stlink/pull/1126))
+- Fixed reading of chip ID on Cortex-M0+ core ([#1125](https://github.com/stlink-org/stlink/pull/1125), [#1126](https://github.com/stlink-org/stlink/pull/1126), [#1133](https://github.com/stlink-org/stlink/pull/1133))
 
 # v1.6.0
 

inc/stm32.h

@@ -8,24 +8,31 @@
 #define STM32_H
 
 /* Cortex core ids */
-#define STM32VL_CORE_ID      0x1ba01477
-#define STM32F7_CORE_ID      0x5ba02477
-#define STM32H7_CORE_ID      0x6ba02477 // STM32H7 SWD ID Code
+#define STM32VL_CORE_ID 0x1ba01477
+#define STM32F7_CORE_ID 0x5ba02477
+#define STM32H7_CORE_ID 0x6ba02477      // STM32H7 SWD ID Code
 #define STM32H7_CORE_ID_JTAG 0x6ba00477 // STM32H7 JTAG ID Code (RM0433 pg3065)
 
 /* Constant STM32 memory map figures */
-#define STM32_FLASH_BASE           ((uint32_t)0x08000000)
-#define STM32_F1_FLASH_BANK2_BASE  ((uint32_t)0x08080000)
-#define STM32_H7_FLASH_BANK2_BASE  ((uint32_t)0x08100000)
-#define STM32_SRAM_BASE            ((uint32_t)0x20000000)
-#define STM32_G0_OPTION_BYTES_BASE ((uint32_t)0x1FFF7800)
-#define STM32_G4_OPTION_BYTES_BASE ((uint32_t)0x1FFFF800)
-#define STM32_L0_CATx_OPTION_BYTES_BASE ((uint32_t)0x1FF80000)
+#define STM32_SRAM_BASE ((uint32_t)0x20000000)
+#define STM32_FLASH_BASE ((uint32_t)0x08000000)
+#define STM32_F1_FLASH_BANK2_BASE ((uint32_t)0x08080000)
+#define STM32_H7_FLASH_BANK2_BASE ((uint32_t)0x08100000)
+
 #define STM32_F2_OPTION_BYTES_BASE ((uint32_t)0x1FFFC000)
-#define STM32_L4_OPTION_BYTES_BASE ((uint32_t)0x1FFF7800)
-#define STM32_L1_OPTION_BYTES_BASE ((uint32_t)0x1FF80000)
 #define STM32_F4_OPTION_BYTES_BASE ((uint32_t)0x40023C14)
 #define STM32_F7_OPTION_BYTES_BASE ((uint32_t)0x1FFF0000)
 #define STM32_H7_OPTION_BYTES_BASE ((uint32_t)0x5200201C)
 
+#define STM32_G0_OPTION_BYTES_BASE ((uint32_t)0x1FFF7800)
+#define STM32_L4_OPTION_BYTES_BASE ((uint32_t)0x1FFF7800)
+
+#define STM32_L0_OPTION_BYTES_BASE ((uint32_t)0x1FF80000)
+#define STM32_L1_OPTION_BYTES_BASE ((uint32_t)0x1FF80000)
+
+#define STM32_F0_OPTION_BYTES_BASE ((uint32_t)0x1FFFF800)
+#define STM32_F1_OPTION_BYTES_BASE ((uint32_t)0x1FFFF800)
+#define STM32_F3_OPTION_BYTES_BASE ((uint32_t)0x1FFFF800)
+#define STM32_G4_OPTION_BYTES_BASE ((uint32_t)0x1FFFF800)
+
 #endif // STM32_H