Skip to content

Commit 12a0363

Browse files
committed
Merge branch 'release/v15.4.1'
2 parents e4d453f + 4122592 commit 12a0363

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

boards/nucleo_wb55rg_p.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"default_tools": [
1616
"stlink"
1717
],
18-
"openocd_target": "stm32w55xx",
18+
"openocd_board": "st_nucleo_wb55",
1919
"jlink_device": "STM32WB55xx",
2020
"onboard_tools": [
2121
"stlink"

builder/frameworks/_bare.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@
2121
env = DefaultEnvironment()
2222

2323
env.Append(
24-
ASPPFLAGS=["-x", "assembler-with-cpp"],
24+
ASFLAGS=[
25+
"-mthumb",
26+
],
27+
ASPPFLAGS=[
28+
"-x", "assembler-with-cpp",
29+
],
2530

2631
CCFLAGS=[
2732
"-Os", # optimize for size
@@ -51,6 +56,9 @@
5156

5257
if "BOARD" in env:
5358
env.Append(
59+
ASFLAGS=[
60+
"-mcpu=%s" % env.BoardConfig().get("build.cpu")
61+
],
5462
CCFLAGS=[
5563
"-mcpu=%s" % env.BoardConfig().get("build.cpu")
5664
],

builder/frameworks/libopencm3

platform.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "git",
1919
"url": "https://github.com/platformio/platform-ststm32.git"
2020
},
21-
"version": "15.4.0",
21+
"version": "15.4.1",
2222
"frameworks": {
2323
"mbed": {
2424
"package": "framework-mbed",
@@ -324,7 +324,7 @@
324324
"type": "uploader",
325325
"optional": true,
326326
"owner": "platformio",
327-
"version": "~1.9.190708"
327+
"version": "~1.11.0"
328328
},
329329
"tool-cmake": {
330330
"optional": true,

0 commit comments

Comments
 (0)