Skip to content

Commit 525598d

Browse files
committed
Use generic GCC toolchain for mbed and zephyr frameworks
1 parent a3b37f7 commit 525598d

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

platform.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
"version": "~1.50400.0",
4343
"optionalVersions": [">=1.60301.0,<1.80000.0"]
4444
},
45+
"toolchain-gccarmnoneeabi": {
46+
"type": "toolchain",
47+
"optional": true,
48+
"owner": "platformio",
49+
"version": "~1.80201.0"
50+
},
4551
"toolchain-gccarmnoneeabi-teensy": {
4652
"type": "toolchain",
4753
"optional": false,

platform.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,18 @@ def configure_default_packages(self, variables, targets):
3232
del self.packages[del_toolchain]
3333

3434
frameworks = variables.get("pioframework", [])
35-
if "mbed" in frameworks:
36-
self.packages["toolchain-gccarmnoneeabi"][
37-
"version"] = ">=1.60301.0,<1.80000.0"
38-
elif "zephyr" in frameworks:
35+
if "arduino" in frameworks:
36+
self.packages.pop("toolchain-gccarmnoneeabi", None)
37+
else:
38+
self.packages["toolchain-gccarmnoneeabi"]["optional"] = False
39+
self.packages.pop("toolchain-gccarmnoneeabi-teensy", None)
40+
41+
if "zephyr" in frameworks:
3942
for p in self.packages:
4043
if p in ("tool-cmake", "tool-dtc", "tool-ninja"):
4144
self.packages[p]["optional"] = False
4245
if not IS_WINDOWS:
4346
self.packages["tool-gperf"]["optional"] = False
44-
self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.80201.0"
4547
elif "arduino" in frameworks and board_config.get("build.core", "") == "teensy4":
4648
self.packages["tool-teensy"]["optional"] = False
4749

0 commit comments

Comments
 (0)