Skip to content

Commit 75f0227

Browse files
committed
Merge branch 'release/v8.1.0'
2 parents 2850251 + 2a07734 commit 75f0227

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Diff for: builder/main.py

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
else:
9797
target_elf = env.BuildProgram()
9898
target_firm = env.ElfToBin(join("$BUILD_DIR", "${PROGNAME}"), target_elf)
99+
env.Depends(target_firm, "checkprogsize")
99100

100101
AlwaysBuild(env.Alias("nobuild", target_firm))
101102
target_buildprog = env.Alias("buildprog", target_firm, target_firm)

Diff for: platform.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "git",
1919
"url": "https://github.com/platformio/platform-freescalekinetis.git"
2020
},
21-
"version": "8.0.0",
21+
"version": "8.1.0",
2222
"frameworks": {
2323
"mbed": {
2424
"package": "framework-mbed",
@@ -42,7 +42,7 @@
4242
"type": "framework",
4343
"optional": true,
4444
"owner": "platformio",
45-
"version": "~6.60600.0",
45+
"version": "~6.60900.0",
4646
"optionalVersions": [
4747
"~6.51506.0"
4848
]

Diff for: platform.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,10 @@ def _add_default_debug_tools(self, board):
133133

134134
def configure_debug_options(self, initial_debug_options, ide_data):
135135
debug_options = copy.deepcopy(initial_debug_options)
136-
server_executable = debug_options["server"]["executable"].lower()
137136
adapter_speed = initial_debug_options.get("speed")
138137
if adapter_speed:
138+
server_options = debug_options.get("server") or {}
139+
server_executable = server_options.get("executable", "").lower()
139140
if "jlink" in server_executable:
140141
debug_options["server"]["arguments"].extend(
141142
["-speed", adapter_speed]

0 commit comments

Comments
 (0)