Skip to content

Commit c115ab2

Browse files
Nightwalker-87Nightwalker-87
committed
General Project Update
- Formatting fixes - Commented CI build setting for Ubuntu 16.04 - Updated CHANGELOG.md
1 parent 6993491 commit c115ab2

File tree

4 files changed

+323
-275
lines changed

4 files changed

+323
-275
lines changed

‎.github/workflows/c-cpp.yml

+103-107
Original file line numberDiff line numberDiff line change
@@ -7,98 +7,97 @@ on:
77
branches: [master, develop, testing]
88

99
jobs:
10+
# Linux
1011

11-
# Linux
12-
13-
job_linux_16_04_64_gcc:
14-
name: ubuntu-16.04 gcc
15-
runs-on: ubuntu-16.04
16-
steps:
17-
- uses: actions/checkout@v2
18-
- name: Install dependencies
19-
run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
20-
- name: make debug
21-
run: sudo make clean && make debug
22-
- name: make test
23-
run: sudo make clean && make test
24-
- name: make release
25-
run: sudo make clean && make release
26-
- name: sudo make install
27-
run: sudo make clean && sudo make install
28-
- name: sudo make package
29-
run: sudo make package
30-
- name: sudo make uninstall
31-
run: sudo make uninstall && sudo make clean
12+
# job_linux_16_04_64_gcc:
13+
# name: ubuntu-16.04 gcc
14+
# runs-on: ubuntu-16.04
15+
# steps:
16+
# - uses: actions/checkout@v2
17+
# - name: Install dependencies
18+
# run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
19+
# - name: make debug
20+
# run: sudo make clean && make debug
21+
# - name: make test
22+
# run: sudo make clean && make test
23+
# - name: make release
24+
# run: sudo make clean && make release
25+
# - name: sudo make install
26+
# run: sudo make clean && sudo make install
27+
# - name: sudo make package
28+
# run: sudo make package
29+
# - name: sudo make uninstall
30+
# run: sudo make uninstall && sudo make clean
3231

33-
job_linux_16_04_32_gcc:
34-
name: ubuntu-16.04 gcc 32-bit
35-
runs-on: ubuntu-16.04
36-
steps:
37-
- uses: actions/checkout@v2
38-
- name: Install dependencies
39-
run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
40-
- name: Set compiler flags
41-
run: |
42-
CFLAGS="$CFLAGS -m32"
43-
CXXFLAGS="$CXXFLAGS -m32"
44-
LDFLAGS="$LDFLAGS -m32"
45-
- name: make debug
46-
run: sudo make clean && make debug
47-
- name: make test
48-
run: sudo make clean && make test
49-
- name: make release
50-
run: sudo make clean && make release
51-
- name: sudo make install
52-
run: sudo make clean && sudo make install
53-
- name: sudo make package
54-
run: sudo make package
55-
- name: sudo make uninstall
56-
run: sudo make uninstall && sudo make clean
32+
# job_linux_16_04_32_gcc:
33+
# name: ubuntu-16.04 gcc 32-bit
34+
# runs-on: ubuntu-16.04
35+
# steps:
36+
# - uses: actions/checkout@v2
37+
# - name: Install dependencies
38+
# run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
39+
# - name: Set compiler flags
40+
# run: |
41+
# CFLAGS="$CFLAGS -m32"
42+
# CXXFLAGS="$CXXFLAGS -m32"
43+
# LDFLAGS="$LDFLAGS -m32"
44+
# - name: make debug
45+
# run: sudo make clean && make debug
46+
# - name: make test
47+
# run: sudo make clean && make test
48+
# - name: make release
49+
# run: sudo make clean && make release
50+
# - name: sudo make install
51+
# run: sudo make clean && sudo make install
52+
# - name: sudo make package
53+
# run: sudo make package
54+
# - name: sudo make uninstall
55+
# run: sudo make uninstall && sudo make clean
5756

58-
job_linux_16_04_64_clang:
59-
name: ubuntu-16.04 clang
60-
runs-on: ubuntu-16.04
61-
steps:
62-
- uses: actions/checkout@v2
63-
- name: Install dependencies
64-
run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
65-
- name: make debug
66-
run: sudo make clean && make debug
67-
- name: make test
68-
run: sudo make clean && make test
69-
- name: make release
70-
run: sudo make clean && make release
71-
- name: sudo make install
72-
run: sudo make clean && sudo make install
73-
- name: sudo make package
74-
run: sudo make package
75-
- name: sudo make uninstall
76-
run: sudo make uninstall && sudo make clean
57+
# job_linux_16_04_64_clang:
58+
# name: ubuntu-16.04 clang
59+
# runs-on: ubuntu-16.04
60+
# steps:
61+
# - uses: actions/checkout@v2
62+
# - name: Install dependencies
63+
# run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
64+
# - name: make debug
65+
# run: sudo make clean && make debug
66+
# - name: make test
67+
# run: sudo make clean && make test
68+
# - name: make release
69+
# run: sudo make clean && make release
70+
# - name: sudo make install
71+
# run: sudo make clean && sudo make install
72+
# - name: sudo make package
73+
# run: sudo make package
74+
# - name: sudo make uninstall
75+
# run: sudo make uninstall && sudo make clean
7776

78-
job_linux_16_04_32_clang:
79-
name: ubuntu-16.04 clang 32-bit
80-
runs-on: ubuntu-16.04
81-
steps:
82-
- uses: actions/checkout@v2
83-
- name: Install dependencies
84-
run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
85-
- name: Set compiler flags
86-
run: |
87-
CFLAGS="$CFLAGS -m32"
88-
CXXFLAGS="$CXXFLAGS -m32"
89-
LDFLAGS="$LDFLAGS -m32"
90-
- name: make debug
91-
run: sudo make clean && make debug
92-
- name: make test
93-
run: sudo make clean && make test
94-
- name: make release
95-
run: sudo make clean && make release
96-
- name: sudo make install
97-
run: sudo make clean && sudo make install
98-
- name: sudo make package
99-
run: sudo make package
100-
- name: sudo make uninstall
101-
run: sudo make uninstall && sudo make clean
77+
# job_linux_16_04_32_clang:
78+
# name: ubuntu-16.04 clang 32-bit
79+
# runs-on: ubuntu-16.04
80+
# steps:
81+
# - uses: actions/checkout@v2
82+
# - name: Install dependencies
83+
# run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
84+
# - name: Set compiler flags
85+
# run: |
86+
# CFLAGS="$CFLAGS -m32"
87+
# CXXFLAGS="$CXXFLAGS -m32"
88+
# LDFLAGS="$LDFLAGS -m32"
89+
# - name: make debug
90+
# run: sudo make clean && make debug
91+
# - name: make test
92+
# run: sudo make clean && make test
93+
# - name: make release
94+
# run: sudo make clean && make release
95+
# - name: sudo make install
96+
# run: sudo make clean && sudo make install
97+
# - name: sudo make package
98+
# run: sudo make package
99+
# - name: sudo make uninstall
100+
# run: sudo make uninstall && sudo make clean
102101

103102
job_linux_18_04_64_gcc:
104103
name: ubuntu-18.04 gcc
@@ -144,7 +143,7 @@ jobs:
144143
run: sudo make package
145144
- name: sudo make uninstall
146145
run: sudo make uninstall && sudo make clean
147-
146+
148147
job_linux_18_04_64_clang:
149148
name: ubuntu-18.04 clang
150149
runs-on: ubuntu-18.04
@@ -280,7 +279,7 @@ jobs:
280279
- name: sudo make uninstall
281280
run: sudo make uninstall && sudo make clean
282281

283-
# macOS
282+
# macOS
284283

285284
# job_macos_10_14_64_gcc:
286285
# name: macos-10.14 gcc
@@ -411,7 +410,6 @@ jobs:
411410
run: sudo make package
412411
- name: sudo make uninstall
413412
run: sudo make uninstall && sudo make clean
414-
415413
# job_macos_11_gcc:
416414
# name: macos-11.0 gcc
417415
# runs-on: macos-11.0
@@ -431,7 +429,6 @@ jobs:
431429
# run: sudo make package
432430
# - name: sudo make uninstall
433431
# run: sudo make uninstall && sudo make clean
434-
435432
# job_macos_11_clang:
436433
# name: macos-11.0 clang
437434
# runs-on: macos-11.0
@@ -451,20 +448,19 @@ jobs:
451448
# run: sudo make package
452449
# - name: sudo make uninstall
453450
# run: sudo make uninstall && sudo make clean
454-
455451
# Linux MinGW cross compliation
456452

457-
# job_linux_20_04_cross:
458-
# name: ubuntu-20.04 mingw64
459-
# runs-on: ubuntu-20.04
460-
# steps:
461-
# - uses: actions/checkout@v2
462-
# - name: Install dependencies
463-
# run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm mingw-w64
464-
# - name: Building Release for Windows (x86-64) ...
465-
# run: sudo mkdir -p build-mingw && cd build-mingw && sudo cmake \
466-
# -DCMAKE_SYSTEM_NAME=Windows \
467-
# -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
468-
# -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake \
469-
# -DCMAKE_INSTALL_PREFIX=$PWD/install $PWD && \
470-
# sudo make && sudo rm -rf build-mingw && cd -
453+
# job_linux_20_04_cross:
454+
# name: ubuntu-20.04 mingw64
455+
# runs-on: ubuntu-20.04
456+
# steps:
457+
# - uses: actions/checkout@v2
458+
# - name: Install dependencies
459+
# run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm mingw-w64
460+
# - name: Building Release for Windows (x86-64) ...
461+
# run: sudo mkdir -p build-mingw && cd build-mingw && sudo cmake \
462+
# -DCMAKE_SYSTEM_NAME=Windows \
463+
# -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
464+
# -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake \
465+
# -DCMAKE_INSTALL_PREFIX=$PWD/install $PWD && \
466+
# sudo make && sudo rm -rf build-mingw && cd -

‎CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Updates & changes:
4141
Fixes:
4242

4343
- 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))
44-
- 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))
44+
- 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))
4545
- 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))
4646
- [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))
4747
- cmake compile failure with external `CMAKE_MODULE_PATH` set ([#962](https://github.com/stlink-org/stlink/pull/962))
@@ -165,7 +165,7 @@ Fixes:
165165
- 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))
166166
- Fixed udev rules installing to wrong directory ([#966](https://github.com/stlink-org/stlink/pull/966))
167167
- 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))
168-
- 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))
168+
- 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))
169169

170170
# v1.6.0
171171

‎inc/stm32.h

+19-12
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,31 @@
88
#define STM32_H
99

1010
/* Cortex core ids */
11-
#define STM32VL_CORE_ID 0x1ba01477
12-
#define STM32F7_CORE_ID 0x5ba02477
13-
#define STM32H7_CORE_ID 0x6ba02477 // STM32H7 SWD ID Code
11+
#define STM32VL_CORE_ID 0x1ba01477
12+
#define STM32F7_CORE_ID 0x5ba02477
13+
#define STM32H7_CORE_ID 0x6ba02477 // STM32H7 SWD ID Code
1414
#define STM32H7_CORE_ID_JTAG 0x6ba00477 // STM32H7 JTAG ID Code (RM0433 pg3065)
1515

1616
/* Constant STM32 memory map figures */
17-
#define STM32_FLASH_BASE ((uint32_t)0x08000000)
18-
#define STM32_F1_FLASH_BANK2_BASE ((uint32_t)0x08080000)
19-
#define STM32_H7_FLASH_BANK2_BASE ((uint32_t)0x08100000)
20-
#define STM32_SRAM_BASE ((uint32_t)0x20000000)
21-
#define STM32_G0_OPTION_BYTES_BASE ((uint32_t)0x1FFF7800)
22-
#define STM32_G4_OPTION_BYTES_BASE ((uint32_t)0x1FFFF800)
23-
#define STM32_L0_CATx_OPTION_BYTES_BASE ((uint32_t)0x1FF80000)
17+
#define STM32_SRAM_BASE ((uint32_t)0x20000000)
18+
#define STM32_FLASH_BASE ((uint32_t)0x08000000)
19+
#define STM32_F1_FLASH_BANK2_BASE ((uint32_t)0x08080000)
20+
#define STM32_H7_FLASH_BANK2_BASE ((uint32_t)0x08100000)
21+
2422
#define STM32_F2_OPTION_BYTES_BASE ((uint32_t)0x1FFFC000)
25-
#define STM32_L4_OPTION_BYTES_BASE ((uint32_t)0x1FFF7800)
26-
#define STM32_L1_OPTION_BYTES_BASE ((uint32_t)0x1FF80000)
2723
#define STM32_F4_OPTION_BYTES_BASE ((uint32_t)0x40023C14)
2824
#define STM32_F7_OPTION_BYTES_BASE ((uint32_t)0x1FFF0000)
2925
#define STM32_H7_OPTION_BYTES_BASE ((uint32_t)0x5200201C)
3026

27+
#define STM32_G0_OPTION_BYTES_BASE ((uint32_t)0x1FFF7800)
28+
#define STM32_L4_OPTION_BYTES_BASE ((uint32_t)0x1FFF7800)
29+
30+
#define STM32_L0_OPTION_BYTES_BASE ((uint32_t)0x1FF80000)
31+
#define STM32_L1_OPTION_BYTES_BASE ((uint32_t)0x1FF80000)
32+
33+
#define STM32_F0_OPTION_BYTES_BASE ((uint32_t)0x1FFFF800)
34+
#define STM32_F1_OPTION_BYTES_BASE ((uint32_t)0x1FFFF800)
35+
#define STM32_F3_OPTION_BYTES_BASE ((uint32_t)0x1FFFF800)
36+
#define STM32_G4_OPTION_BYTES_BASE ((uint32_t)0x1FFFF800)
37+
3138
#endif // STM32_H

0 commit comments

Comments
 (0)