Skip to content

Commit 485e2e4

Browse files
committed
Handle clock and protocol in JLink template
Signed-off-by: Jens Reinecke <jens.reinecke@arm.com>
1 parent 4baa597 commit 485e2e4

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

templates/JLink.adapter.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
"JLinkGDBServerCL": "JLinkGDBServerCL<%= platform === 'win32' ? '.exe' : '' %>",
2121
"JLink": "JLink<%= platform === 'win32' ? '.exe' : 'Exe' %>",
2222
"jlinkDevice": "<%= device_name %><%= start_pname ? `_${start_pname}` : '' %>",
23-
"jlinkDevices": "<%= Object.fromEntries(processors.map(pname => [pname ?? '', `${device_name}_${pname ?? start_pname ?? ''}`])) %>"
23+
"jlinkDevices": "<%= Object.fromEntries(processors.map(pname => [pname ?? '', `${device_name}_${pname ?? start_pname ?? ''}`])) %>",
24+
"defaultClock": 4000,
25+
"scaleClock": 1000
2426
},
2527
"launch": {
2628
"singlecore-launch": {
@@ -47,8 +49,8 @@
4749
"serverParameters": [
4850
"-device", "<%= device_name %>\n",
4951
"-endian", "little",
50-
"-if", "SWD",
51-
"-speed", "4000",
52+
"-if", "<%= config.protocol ?? 'swd' %>\n",
53+
"-speed", "<%= parseInt((config.clock ?? data.defaultClock) / data.scaleClock) %>\n",
5254
"-noir",
5355
"-vd",
5456
"-nogui",
@@ -110,8 +112,8 @@
110112
"serverParameters": [
111113
"-device", "<%= data.jlinkDevices[pname] %>\n",
112114
"-endian", "little",
113-
"-if", "SWD",
114-
"-speed", "4000",
115+
"-if", "<%= config.protocol ?? 'swd' %>\n",
116+
"-speed", "<%= parseInt((config.clock ?? data.defaultClock) / data.scaleClock) %>\n",
115117
"-noir",
116118
"-vd",
117119
"-nogui",
@@ -170,8 +172,8 @@
170172
"serverParameters": [
171173
"-device", "<%= data.jlinkDevices[pname] %>\n",
172174
"-endian", "little",
173-
"-if", "SWD",
174-
"-speed", "4000",
175+
"-if", "<%= config.protocol ?? 'swd' %>\n",
176+
"-speed", "<%= parseInt((config.clock ?? data.defaultClock) / data.scaleClock) %>\n",
175177
"-noir",
176178
"-vd",
177179
"-nogui",
@@ -194,7 +196,7 @@
194196
"echo Connect > .cmd.jlink &&",
195197
"echo Erase >> .cmd.jlink &&",
196198
"echo Exit >> .cmd.jlink &&",
197-
"<%= data.JLink %> -device <%= data.jlinkDevice %> -if SWD -speed 4000 -commandfile .cmd.jlink"
199+
"<%= data.JLink %> -device <%= data.jlinkDevice %> -if <%= config.protocol ?? 'swd' %> -speed <%= parseInt((config.clock ?? data.defaultClock) / data.scaleClock) %> -commandfile .cmd.jlink"
198200
],
199201
"options": {
200202
"cwd": "<%= data.cwd %>",
@@ -209,7 +211,7 @@
209211
"echo Connect > .cmd.jlink &&",
210212
"<%= image_files.map(image => `echo LoadFile \"${image.file}\" >> .cmd.jlink &&\\n`).join('') %>",
211213
"echo Exit >> .cmd.jlink &&",
212-
"<%= data.JLink %> -device <%= data.jlinkDevice %> -if SWD -speed 4000 -commandfile .cmd.jlink"
214+
"<%= data.JLink %> -device <%= data.jlinkDevice %> -if <%= config.protocol ?? 'swd' %> -speed <%= parseInt((config.clock ?? data.defaultClock) / data.scaleClock) %> -commandfile .cmd.jlink"
213215
],
214216
"options": {
215217
"cwd": "<%= data.cwd %>",
@@ -228,8 +230,8 @@
228230
"args": [
229231
"-device", "<%= data.jlinkDevice %>\n",
230232
"-endian", "little",
231-
"-if", "SWD",
232-
"-speed", "4000",
233+
"-if", "<%= config.protocol ?? 'swd' %>",
234+
"-speed", "<%= parseInt((config.clock ?? data.defaultClock) / data.scaleClock) %>\n",
233235
"-nohalt",
234236
"-noir",
235237
"-nogui",

0 commit comments

Comments
 (0)