Skip to content

Commit 9551085

Browse files
committed
rename sketch and bootloader start sections labels
1 parent 04f4a1f commit 9551085

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

boards.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ arduino_zero_edbg.build.variant=arduino_zero
3939
arduino_zero_edbg.build.variant_system_lib=
4040
arduino_zero_edbg.build.vid=0x2341
4141
arduino_zero_edbg.build.pid=0x804d
42-
arduino_zero_edbg.build.section.start=0x2000
42+
arduino_zero_edbg.build.sketch.start=0x2000
4343
arduino_zero_edbg.bootloader.tool=openocd
4444
arduino_zero_edbg.bootloader.file=zero/samd21_sam_ba.bin
4545

@@ -86,7 +86,7 @@ arduino_zero_native.build.variant=arduino_zero
8686
arduino_zero_native.build.variant_system_lib=
8787
arduino_zero_native.build.vid=0x2341
8888
arduino_zero_native.build.pid=0x804d
89-
arduino_zero_native.build.section.start=0x2000
89+
arduino_zero_native.build.sketch.start=0x2000
9090
arduino_zero_native.bootloader.tool=openocd
9191
arduino_zero_native.bootloader.file=zero/samd21_sam_ba.bin
9292

@@ -132,7 +132,7 @@ mkr1000.build.openocdscript=openocd_scripts/arduino_zero.cfg
132132
mkr1000.build.variant=mkr1000
133133
mkr1000.build.vid=0x2341
134134
mkr1000.build.pid=0x804e
135-
mkr1000.build.section.start=0x2000
135+
mkr1000.build.sketch.start=0x2000
136136
mkr1000.bootloader.tool=openocd
137137
mkr1000.bootloader.file=mkr1000/samd21_sam_ba_arduino_mkr1000.bin
138138

@@ -162,7 +162,7 @@ mkrzero.build.openocdscript=openocd_scripts/arduino_zero.cfg
162162
mkrzero.build.variant=mkrzero
163163
mkrzero.build.vid=0x2341
164164
mkrzero.build.pid=0x804f
165-
mkrzero.build.section.start=0x2000
165+
mkrzero.build.sketch.start=0x2000
166166
mkrzero.bootloader.tool=openocd
167167
mkrzero.bootloader.file=mkrzero/samd21_sam_ba_arduino_mkrzero.bin
168168

@@ -219,7 +219,7 @@ mzero_pro_bl_dbg.build.variant_system_lib=
219219
mzero_pro_bl_dbg.build.vid=0x2a03
220220
mzero_pro_bl_dbg.build.pid=0x804f
221221
mzero_pro_bl_dbg.build.preferred_out_format=hex
222-
mzero_pro_bl_dbg.build.section.start=0x4000
222+
mzero_pro_bl_dbg.build.sketch.start=0x4000
223223

224224
mzero_pro_bl_dbg.bootloader.tool=openocd
225225
mzero_pro_bl_dbg.bootloader.cmd_unprotect=at91samd bootloader 0
@@ -257,7 +257,7 @@ mzero_pro_bl.build.variant_system_lib=
257257
mzero_pro_bl.build.vid=0x2a03
258258
mzero_pro_bl.build.pid=0x804f
259259
mzero_pro_bl.build.preferred_out_format=hex
260-
mzero_pro_bl.build.section.start=0x4000
260+
mzero_pro_bl.build.sketch.start=0x4000
261261
mzero_pro_bl.build.emu.mcu=atmega2560
262262
mzero_pro_bl.bootloader.tool=avrdude
263263
mzero_pro_bl.bootloader.low_fuses=0xff
@@ -292,7 +292,7 @@ mzero_bl.build.variant_system_lib=
292292
mzero_bl.build.vid=0x2a03
293293
mzero_bl.build.pid=0x804e
294294
mzero_bl.build.preferred_out_format=hex
295-
mzero_bl.build.section.start=0x4000
295+
mzero_bl.build.sketch.start=0x4000
296296
mzero_bl.build.emu.mcu=atmega2560
297297
mzero_bl.bootloader.tool=avrdude
298298
mzero_bl.bootloader.low_fuses=0xff
@@ -326,7 +326,7 @@ tian.build.variant_system_lib=
326326
tian.build.vid=0x2a03
327327
tian.build.pid=0x8052
328328
tian.build.preferred_out_format=hex
329-
tian.build.section.start=0x4000
329+
tian.build.sketch.start=0x4000
330330
tian.build.emu.mcu=atmega2560
331331
tian.bootloader.tool=avrdude
332332
tian.bootloader.low_fuses=0xff

platform.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON '-DUSB_MANU
7474
# numeric vendor ID if available or by board's specific value.
7575
build.usb_manufacturer="Unknown"
7676

77+
# Sketch and bootloader start section
78+
# -----------------------------------
79+
build.sketch.start=0x2000
80+
build.bootloader.start=0x0000
7781

7882
# Compile patterns
7983
# ----------------
@@ -150,8 +154,10 @@ tools.openocd.cmd.windows=bin/openocd.exe
150154

151155
tools.openocd.upload.params.verbose=-d2
152156
tools.openocd.upload.params.quiet=-d0
153-
tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{{build.path}/{build.project_name}.bin}} verify reset {build.section.start}; shutdown"
157+
tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{{build.path}/{build.project_name}.bin}} verify reset {build.sketch.start}; shutdown"
154158

159+
160+
# Program flashes the binary at 0x0000, so use the linker script without_bootloader
155161
tools.openocd.program.params.verbose=-d2
156162
tools.openocd.program.params.quiet=-d0
157163
tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{{build.path}/{build.project_name}.elf}} verify reset; shutdown"

0 commit comments

Comments
 (0)