Skip to content

Commit 7e06070

Browse files
Started to add linux 64 bit support, by copying the linux folder to linux64 and changeing platform.txt. Also copied scr folder into each platform's folder to allow the src to be distributed even if the tools are split up when using the Board Manager
1 parent 1b4ee05 commit 7e06070

555 files changed

Lines changed: 58520 additions & 9441 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

STM32F1/platform.txt

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,13 @@ recipe.output.save_file={build.project_name}.{build.variant}.bin
107107
# Uploader tools
108108
# -------------------
109109

110-
111-
112110
# Upload using Maple bootloader over DFU
113111
tools.maple_upload.cmd=maple_upload
114112
tools.maple_upload.cmd.windows=maple_upload.bat
115113
tools.maple_upload.path={runtime.hardware.path}/tools/win
116114
tools.maple_upload.path.macosx={runtime.hardware.path}/tools/macosx
117-
tools.maple_upload.path.linux={runtime.hardware.path}/tools/linux
118-
115+
tools.maple_upload.path.linux={runtime.hardware.path}/tools/linux
116+
tools.maple_upload.path.linux64={runtime.hardware.path}/tools/linux64
119117
tools.maple_upload.upload.params.verbose=-d
120118
tools.maple_upload.upload.params.quiet=
121119
tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
@@ -129,29 +127,18 @@ tools.serial_upload.cmd.macosx=serial_upload
129127
tools.serial_upload.path={runtime.hardware.path}/tools/win
130128
tools.serial_upload.path.macosx={runtime.hardware.path}/tools/macosx
131129
tools.serial_upload.path.linux={runtime.hardware.path}/tools/linux
132-
130+
tools.serial_upload.path.linux64={runtime.hardware.path}/tools/linux64
133131
tools.serial_upload.upload.params.verbose=-d
134132
tools.serial_upload.upload.params.quiet=n
135133
tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
136134

137-
138-
tools.upload_router.cmd=upload_router
139-
tools.upload_router.cmd.windows=upload_router.bat
140-
tools.upload_router.path={runtime.hardware.path}/tools/win
141-
tools.upload_router.path.macosx={runtime.hardware.path}/tools/macosx
142-
tools.upload_router.path.linux={runtime.hardware.path}/tools/linux
143-
144-
tools.upload_router.upload.params.verbose=-d
145-
tools.upload_router.upload.params.quiet=
146-
tools.upload_router.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}" {upload.protocol} {build.debuggingMode} "{runtime.ide.path}/hardware/tools/{build.gcc_ver}/bin/"
147-
148135
# stlink upload
149136
tools.stlink_upload.cmd=stlink_upload
150137
tools.stlink_upload.cmd.windows=stlink_upload.bat
151138
tools.stlink_upload.path.windows={runtime.hardware.path}/tools/win
152139
tools.stlink_upload.path.macosx={runtime.hardware.path}/tools/macosx
153140
tools.stlink_upload.path.linux={runtime.hardware.path}/tools/linux
154-
141+
tools.stlink_upload.path.linux64={runtime.hardware.path}/tools/linux64
155142
tools.stlink_upload.upload.params.verbose=-d
156143
tools.stlink_upload.upload.params.quiet=
157144
tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
@@ -162,4 +149,4 @@ tools.bmp_upload.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
162149
tools.bmp_upload.upload.speed=230400
163150
tools.bmp_upload.upload.params.verbose=
164151
tools.bmp_upload.upload.params.quiet=-q --batch-silent
165-
tools.bmp_upload.upload.pattern="{path}{cmd}" -cd "{build.path}" -b {upload.speed} {upload.verbose} -ex "set debug remote 0" -ex "set target-async off" -ex "set remotetimeout 60" -ex "set mem inaccessible-by-default off" -ex "set confirm off" -ex "set height 0" -ex "target extended-remote {serial.port}" -ex "monitor swdp_scan" -ex "attach 1" -ex "x/wx 0x8000004" -ex "monitor erase_mass" -ex "echo 0x8000004 expect 0xffffffff after erase\n" -ex "x/wx 0x8000004" -ex "file {build.project_name}.elf" -ex "load" -ex "x/wx 0x08000004" -ex "tbreak main" -ex "run" -ex "echo \n\n\nUpload finished!" -ex "quit"
152+
tools.bmp_upload.upload.pattern="{path}{cmd}" -cd "{build.path}" -b {upload.speed} {upload.verbose} -ex "set debug remote 0" -ex "set target-async off" -ex "set remotetimeout 60" -ex "set mem inaccessible-by-default off" -ex "set confirm off" -ex "set height 0" -ex "target extended-remote {serial.port}" -ex "monitor swdp_scan" -ex "attach 1" -ex "x/wx 0x8000004" -ex "monitor erase_mass" -ex "echo 0x8000004 expect 0xffffffff after erase\n" -ex "x/wx 0x8000004" -ex "file {build.project_name}.elf" -ex "load" -ex "x/wx 0x08000004" -ex "tbreak main" -ex "run" -ex "echo \n\n\nUpload finished!" -ex "quit"
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
Authors ordered by first contribution.
2-
3-
Harald Welte
4-
Werner Almesberger
5-
Michael Lauer
6-
Jim Huang
7-
Stefan Schmidt
8-
Daniel Willmann
9-
Mike Frysinger
10-
Uwe Hermann
11-
C. Scott Ananian
12-
Bernard Blackham
13-
Holger Freyther
14-
Marc Singer
15-
James Perkins
16-
Tommi Keisala
17-
Pascal Schweizer
18-
Bradley Scott
19-
Uwe Bonnes
20-
Andrey Smirnov
21-
Jussi Timperi
22-
Hans Petter Selasky
23-
Bo Shen
24-
Henrique de Almeida Mendonca
25-
Bernd Krumboeck
26-
Dennis Meier
27-
Veli-Pekka Peltola
28-
Dave Hylands
29-
Michael Grzeschik
30-
Paul Fertser
1+
Authors ordered by first contribution.
2+
3+
Harald Welte
4+
Werner Almesberger
5+
Michael Lauer
6+
Jim Huang
7+
Stefan Schmidt
8+
Daniel Willmann
9+
Mike Frysinger
10+
Uwe Hermann
11+
C. Scott Ananian
12+
Bernard Blackham
13+
Holger Freyther
14+
Marc Singer
15+
James Perkins
16+
Tommi Keisala
17+
Pascal Schweizer
18+
Bradley Scott
19+
Uwe Bonnes
20+
Andrey Smirnov
21+
Jussi Timperi
22+
Hans Petter Selasky
23+
Bo Shen
24+
Henrique de Almeida Mendonca
25+
Bernd Krumboeck
26+
Dennis Meier
27+
Veli-Pekka Peltola
28+
Dave Hylands
29+
Michael Grzeschik
30+
Paul Fertser

0 commit comments

Comments
 (0)