Skip to content

Commit 86635a1

Browse files
ivankravetsivankravets
committed
Merge branch 'hotfix/v5.4.3'
2 parents eb7b411 + 11cf2c5 commit 86635a1

14 files changed

+77
-224
lines changed

‎boards/blackpill_f103c8.json

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,16 @@
1919
"variant": "BLUEPILL_F103XX"
2020
},
2121
"debug": {
22+
"default_tools": [
23+
"stlink"
24+
],
2225
"jlink_device": "STM32F103C8",
26+
"openocd_extra_args": [
27+
"-c",
28+
"reset_config none"
29+
],
2330
"openocd_target": "stm32f1x",
24-
"svd_path": "STM32F103xx.svd",
25-
"tools": {
26-
"stlink": {
27-
"default": true,
28-
"server": {
29-
"arguments": [
30-
"-f",
31-
"scripts/interface/stlink.cfg",
32-
"-c",
33-
"transport select hla_swd",
34-
"-f",
35-
"scripts/target/stm32f1x.cfg",
36-
"-c",
37-
"reset_config none"
38-
],
39-
"executable": "bin/openocd",
40-
"package": "tool-openocd"
41-
}
42-
}
43-
}
31+
"svd_path": "STM32F103xx.svd"
4432
},
4533
"frameworks": [
4634
"arduino",

‎boards/blackpill_f103c8_128.json

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,16 @@
1919
"variant": "BLUEPILL_F103XX"
2020
},
2121
"debug": {
22+
"default_tools": [
23+
"stlink"
24+
],
2225
"jlink_device": "STM32F103C8",
26+
"openocd_extra_args": [
27+
"-c",
28+
"reset_config none"
29+
],
2330
"openocd_target": "stm32f1x",
24-
"svd_path": "STM32F103xx.svd",
25-
"tools": {
26-
"stlink": {
27-
"default": true,
28-
"server": {
29-
"arguments": [
30-
"-f",
31-
"scripts/interface/stlink.cfg",
32-
"-c",
33-
"transport select hla_swd",
34-
"-f",
35-
"scripts/target/stm32f1x.cfg",
36-
"-c",
37-
"reset_config none"
38-
],
39-
"executable": "bin/openocd",
40-
"package": "tool-openocd"
41-
}
42-
}
43-
}
31+
"svd_path": "STM32F103xx.svd"
4432
},
4533
"frameworks": [
4634
"arduino",

‎boards/bluepill_f103c6.json

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,16 @@
1818
"variant": "BLUEPILL_F103XX"
1919
},
2020
"debug": {
21+
"default_tools": [
22+
"stlink"
23+
],
2124
"jlink_device": "STM32F103C6",
25+
"openocd_extra_args": [
26+
"-c",
27+
"reset_config none"
28+
],
2229
"openocd_target": "stm32f1x",
23-
"svd_path": "STM32F103xx.svd",
24-
"tools": {
25-
"stlink": {
26-
"default": true,
27-
"server": {
28-
"arguments": [
29-
"-f",
30-
"scripts/interface/stlink.cfg",
31-
"-c",
32-
"transport select hla_swd",
33-
"-f",
34-
"scripts/target/stm32f1x.cfg",
35-
"-c",
36-
"reset_config none"
37-
],
38-
"executable": "bin/openocd",
39-
"package": "tool-openocd"
40-
}
41-
}
42-
}
30+
"svd_path": "STM32F103xx.svd"
4331
},
4432
"frameworks": [
4533
"arduino",

‎boards/bluepill_f103c8.json

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,16 @@
1919
"variant": "BLUEPILL_F103XX"
2020
},
2121
"debug": {
22+
"default_tools": [
23+
"stlink"
24+
],
2225
"jlink_device": "STM32F103C8",
26+
"openocd_extra_args": [
27+
"-c",
28+
"reset_config none"
29+
],
2330
"openocd_target": "stm32f1x",
24-
"svd_path": "STM32F103xx.svd",
25-
"tools": {
26-
"stlink": {
27-
"default": true,
28-
"server": {
29-
"arguments": [
30-
"-f",
31-
"scripts/interface/stlink.cfg",
32-
"-c",
33-
"transport select hla_swd",
34-
"-f",
35-
"scripts/target/stm32f1x.cfg",
36-
"-c",
37-
"reset_config none"
38-
],
39-
"executable": "bin/openocd",
40-
"package": "tool-openocd"
41-
}
42-
}
43-
}
31+
"svd_path": "STM32F103xx.svd"
4432
},
4533
"frameworks": [
4634
"arduino",

‎boards/bluepill_f103c8_128k.json

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,16 @@
1919
"variant": "BLUEPILL_F103XX"
2020
},
2121
"debug": {
22+
"default_tools": [
23+
"stlink"
24+
],
2225
"jlink_device": "STM32F103C8",
26+
"openocd_extra_args": [
27+
"-c",
28+
"reset_config none"
29+
],
2330
"openocd_target": "stm32f1x",
24-
"svd_path": "STM32F103xx.svd",
25-
"tools": {
26-
"stlink": {
27-
"default": true,
28-
"server": {
29-
"arguments": [
30-
"-f",
31-
"scripts/interface/stlink.cfg",
32-
"-c",
33-
"transport select hla_swd",
34-
"-f",
35-
"scripts/target/stm32f1x.cfg",
36-
"-c",
37-
"reset_config none"
38-
],
39-
"executable": "bin/openocd",
40-
"package": "tool-openocd"
41-
}
42-
}
43-
}
31+
"svd_path": "STM32F103xx.svd"
4432
},
4533
"frameworks": [
4634
"arduino",

‎boards/eval_l073z.json

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,51 +14,7 @@
1414
"stlink"
1515
],
1616
"openocd_target": "stm32l0",
17-
"svd_path": "STM32L07x.svd",
18-
"tools": {
19-
"jlink": {
20-
"server": [
21-
{
22-
"arguments": [
23-
"-singlerun",
24-
"-if",
25-
"SWD",
26-
"-select",
27-
"USB",
28-
"-device",
29-
"STM32L073VZ",
30-
"-port",
31-
"2331"
32-
],
33-
"executable": "JLinkGDBServerCL.exe",
34-
"system": [
35-
"windows",
36-
"windows_amd64",
37-
"windows_x86"
38-
]
39-
},
40-
{
41-
"arguments": [
42-
"-singlerun",
43-
"-if",
44-
"SWD",
45-
"-select",
46-
"USB",
47-
"-device",
48-
"STM32L073VZ",
49-
"-port",
50-
"2331"
51-
],
52-
"executable": "JLinkGDBServer",
53-
"system": [
54-
"darwin_x86_64",
55-
"linux_i686",
56-
"linux_x86_64"
57-
]
58-
}
59-
]
60-
}
61-
}
17+
"svd_path": "STM32L07x.svd"
6218
},
6319
"frameworks": [
6420
"stm32cube"

‎boards/genericSTM32F407VET6.json

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,16 @@
1919
"variant": "stm32f4"
2020
},
2121
"debug": {
22+
"default_tools": [
23+
"stlink"
24+
],
2225
"jlink_device": "STM32F407VE",
26+
"openocd_extra_args": [
27+
"-c",
28+
"reset_config none"
29+
],
2330
"openocd_target": "stm32f4x",
24-
"svd_path": "STM32F40x.svd",
25-
"tools": {
26-
"stlink": {
27-
"server": {
28-
"arguments": [
29-
"-f",
30-
"scripts/interface/stlink.cfg",
31-
"-c",
32-
"transport select hla_swd",
33-
"-f",
34-
"scripts/target/stm32f4x.cfg",
35-
"-c",
36-
"reset_config none"
37-
],
38-
"executable": "bin/openocd",
39-
"package": "tool-openocd"
40-
}
41-
}
42-
}
31+
"svd_path": "STM32F40x.svd"
4332
},
4433
"frameworks": [
4534
"arduino",

‎boards/genericSTM32F407VGT6.json

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,16 @@
1919
"variant": "DISCO_F407VG"
2020
},
2121
"debug": {
22+
"default_tools": [
23+
"stlink"
24+
],
2225
"jlink_device": "STM32F407VG",
26+
"openocd_extra_args": [
27+
"-c",
28+
"reset_config none"
29+
],
2330
"openocd_target": "stm32f4x",
24-
"svd_path": "STM32F40x.svd",
25-
"tools": {
26-
"stlink": {
27-
"server": {
28-
"arguments": [
29-
"-f",
30-
"scripts/interface/stlink.cfg",
31-
"-c",
32-
"transport select hla_swd",
33-
"-f",
34-
"scripts/target/stm32f4x.cfg",
35-
"-c",
36-
"reset_config none"
37-
],
38-
"executable": "bin/openocd",
39-
"package": "tool-openocd"
40-
}
41-
}
42-
}
31+
"svd_path": "STM32F40x.svd"
4332
},
4433
"frameworks": [
4534
"arduino",

‎boards/mxchip_az3166.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
],
3030
"name": "Microsoft Azure IoT Development Kit (MXChip AZ3166)",
3131
"upload": {
32-
"offset_address": "0x0800C000",
3332
"maximum_ram_size": 262144,
3433
"maximum_size": 1048576,
34+
"offset_address": "0x0800C000",
3535
"protocol": "stlink",
3636
"protocols": [
3737
"jlink",

‎boards/netduino2plus.json

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,16 @@
1515
"variant": "stm32f4"
1616
},
1717
"debug": {
18+
"default_tools": [
19+
"stlink"
20+
],
1821
"jlink_device": "STM32F405RG",
22+
"openocd_extra_args": [
23+
"-c",
24+
"reset_config none"
25+
],
1926
"openocd_target": "stm32f4x",
20-
"svd_path": "STM32F40x.svd",
21-
"tools": {
22-
"stlink": {
23-
"server": {
24-
"arguments": [
25-
"-f",
26-
"scripts/interface/stlink.cfg",
27-
"-c",
28-
"transport select hla_swd",
29-
"-f",
30-
"scripts/target/stm32f4x.cfg",
31-
"-c",
32-
"reset_config none"
33-
],
34-
"executable": "bin/openocd",
35-
"package": "tool-openocd"
36-
}
37-
}
38-
}
27+
"svd_path": "STM32F40x.svd"
3928
},
4029
"frameworks": [
4130
"arduino",

0 commit comments

Comments
 (0)