Switching to only two boards

boards.txt

@@ -1,92 +1,45 @@
+arduino_zero_edbg.name=Arduino Zero (Programming Port)
+arduino_zero_edbg.vid.0=0x03eb
+arduino_zero_edbg.pid.0=0x2111
+arduino_zero_edbg.upload.tool=openocd
+arduino_zero_edbg.upload.protocol=sam-ba
+arduino_zero_edbg.upload.maximum_size=262144
+arduino_zero_edbg.upload.use_1200bps_touch=false
+arduino_zero_edbg.upload.wait_for_upload_port=false
+arduino_zero_edbg.upload.native_usb=false
+arduino_zero_edbg.build.mcu=cortex-m0plus
+arduino_zero_edbg.build.f_cpu=48000000L
+arduino_zero_edbg.build.usb_product="Arduino Zero"
+arduino_zero_edbg.build.board=SAM_ZERO
+arduino_zero_edbg.build.core=arduino
+arduino_zero_edbg.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
+arduino_zero_edbg.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+arduino_zero_edbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
+arduino_zero_edbg.build.variant=arduino_zero
+arduino_zero_edbg.build.variant_system_lib=
+arduino_zero_edbg.build.vid=0x03eb
+arduino_zero_edbg.build.pid=0x2111
+arduino_zero_edbg.bootloader.tool=openocd
+arduino_zero_edbg.bootloader.file=zero/Debug/Exe/samd21_sam_ba.out
 
-arduino_zero_dbg.name=Arduino Zero (Programming Port)
+arduino_zero_native.name=Arduino Zero (Native USB Port)
-arduino_zero_dbg.vid.0=0x03eb
+arduino_zero_native.vid.0=0x2341
-arduino_zero_dbg.pid.0=0x2111
+arduino_zero_native.pid.0=0x004d
-arduino_zero_dbg.upload.tool=openocd
+arduino_zero_native.upload.tool=bossac
-arduino_zero_dbg.upload.protocol=sam-ba
+arduino_zero_native.upload.protocol=sam-ba
-arduino_zero_dbg.upload.maximum_size=262144
+arduino_zero_native.upload.maximum_size=262144
-arduino_zero_dbg.upload.use_1200bps_touch=false
+arduino_zero_native.upload.use_1200bps_touch=false
-arduino_zero_dbg.upload.wait_for_upload_port=false
+arduino_zero_native.upload.wait_for_upload_port=false
-arduino_zero_dbg.upload.native_usb=false
+arduino_zero_native.upload.native_usb=true
-arduino_zero_dbg.build.mcu=cortex-m0plus
+arduino_zero_native.build.mcu=cortex-m0plus
-arduino_zero_dbg.build.f_cpu=48000000L
+arduino_zero_native.build.f_cpu=48000000L
-arduino_zero_dbg.build.usb_product="Arduino Zero"
+arduino_zero_native.build.usb_product="Arduino Zero"
-arduino_zero_dbg.build.board=SAM_ZERO
+arduino_zero_native.build.board=SAM_ZERO
-arduino_zero_dbg.build.core=arduino
+arduino_zero_native.build.core=arduino
-arduino_zero_dbg.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
+arduino_zero_native.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
-arduino_zero_dbg.build.ldscript=linker_scripts/gcc/flash.ld
+arduino_zero_native.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-arduino_zero_dbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
+arduino_zero_native.build.openocdscript=openocd_scripts/arduino_zero.cfg
-arduino_zero_dbg.build.variant=arduino_zero
+arduino_zero_native.build.variant=arduino_zero
-arduino_zero_dbg.build.variant_system_lib=
+arduino_zero_native.build.variant_system_lib=
-arduino_zero_dbg.build.vid=0x03eb
+arduino_zero_native.build.vid=0x2341
-arduino_zero_dbg.build.pid=0x2111
+arduino_zero_native.build.pid=0x004d
-arduino_zero_dbg.bootloader.tool=openocd
-arduino_zero_dbg.bootloader.file=zero/Debug/Exe/samd21_sam_ba.out
-
-arduino_zero.name=Arduino Zero (Native USB Port)
-arduino_zero.vid.0=0x2341
-arduino_zero.pid.0=0x004d
-arduino_zero.upload.tool=bossac
-arduino_zero.upload.protocol=sam-ba
-arduino_zero.upload.maximum_size=262144
-arduino_zero.upload.use_1200bps_touch=false
-arduino_zero.upload.wait_for_upload_port=false
-arduino_zero.upload.native_usb=true
-arduino_zero.build.mcu=cortex-m0plus
-arduino_zero.build.f_cpu=48000000L
-arduino_zero.build.usb_product="Arduino Zero"
-arduino_zero.build.board=SAM_ZERO
-arduino_zero.build.core=arduino
-arduino_zero.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
-arduino_zero.build.ldscript=linker_scripts/gcc/flash.ld
-arduino_zero.build.openocdscript=openocd_scripts/arduino_zero.cfg
-arduino_zero.build.variant=arduino_zero
-arduino_zero.build.variant_system_lib=
-arduino_zero.build.vid=0x2341
-arduino_zero.build.pid=0x004d
-
-arduino_zero_bl_dbg.name=Arduino Zero with Bootloader (Programming Port)
-arduino_zero_bl_dbg.vid.0=0x03eb
-arduino_zero_bl_dbg.pid.0=0x2111
-arduino_zero_bl_dbg.upload.tool=openocd
-arduino_zero_bl_dbg.upload.protocol=sam-ba
-arduino_zero_bl_dbg.upload.maximum_size=262144
-arduino_zero_bl_dbg.upload.use_1200bps_touch=false
-arduino_zero_bl_dbg.upload.wait_for_upload_port=false
-arduino_zero_bl_dbg.upload.native_usb=false
-arduino_zero_bl_dbg.build.mcu=cortex-m0plus
-arduino_zero_bl_dbg.build.f_cpu=48000000L
-arduino_zero_bl_dbg.build.usb_product="Arduino Zero"
-arduino_zero_bl_dbg.build.board=SAM_ZERO
-arduino_zero_bl_dbg.build.core=arduino
-arduino_zero_bl_dbg.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
-arduino_zero_bl_dbg.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-arduino_zero_bl_dbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
-arduino_zero_bl_dbg.build.variant=arduino_zero
-arduino_zero_bl_dbg.build.variant_system_lib=
-arduino_zero_bl_dbg.build.vid=0x03eb
-arduino_zero_bl_dbg.build.pid=0x2111
-arduino_zero_bl_dbg.bootloader.tool=openocd
-arduino_zero_bl_dbg.bootloader.file=zero/Debug/Exe/samd21_sam_ba.out
-
-arduino_zero_bl.name=Arduino Zero with Bootloader (Native USB Port)
-arduino_zero_bl.vid.0=0x2341
-arduino_zero_bl.pid.0=0x004d
-arduino_zero_bl.upload.tool=bossac
-arduino_zero_bl.upload.protocol=sam-ba
-arduino_zero_bl.upload.maximum_size=262144
-arduino_zero_bl.upload.use_1200bps_touch=false
-arduino_zero_bl.upload.wait_for_upload_port=false
-arduino_zero_bl.upload.native_usb=true
-arduino_zero_bl.build.mcu=cortex-m0plus
-arduino_zero_bl.build.f_cpu=48000000L
-arduino_zero_bl.build.usb_product="Arduino Zero"
-arduino_zero_bl.build.board=SAM_ZERO
-arduino_zero_bl.build.core=arduino
-arduino_zero_bl.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
-arduino_zero_bl.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-arduino_zero_bl.build.openocdscript=openocd_scripts/arduino_zero.cfg
-arduino_zero_bl.build.variant=arduino_zero
-arduino_zero_bl.build.variant_system_lib=
-arduino_zero_bl.build.vid=0x2341
-arduino_zero_bl.build.pid=0x004d

platform.txt

@@ -1,11 +1,10 @@
-
+# Arduino SAMD Core and platform.
-# Arduino SAM Core and platform.
 #
 # For more info:
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Arduino ARM Cortex-M0+ (32-bits) Boards
-version=1.5.6
+version=1.8.0
 
 # Compile variables
 # ----------------------
@@ -14,7 +13,6 @@ compiler.path={runtime.ide.path}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/b
 compiler.c.cmd=arm-none-eabi-gcc
 compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os -w -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf
 #-std=gnu99
-#compiler.c.elf.cmd=arm-none-eabi-g++
 compiler.c.elf.cmd=arm-none-eabi-gcc
 compiler.c.elf.flags=-Os -Wl,--gc-sections -save-temps
 compiler.S.flags=-c -g -x assembler-with-cpp
@@ -63,12 +61,9 @@ recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU=
 recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {compiler.arm.cmsis.path} {includes} "{source_file}" -o "{object_file}"
 
 ## Create archives
-#recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/lib{archive_file}" "{object_file}"
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/libarduino_core.a" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-#recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -save-temps -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" --specs=nano.specs "-L{build.path}" -mthumb {compiler.ldflags} {object_files} -Wl,--start-group -lm -lgcc "{build.path}/{archive_file}" -Wl,--end-group
-#recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" --specs=nano.specs {compiler.ldflags} {object_files} -Wl,--start-group -lm -lgcc -l{archive_file} -Wl,--end-group
 recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nano.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--start-group -lm -larduino_core -Wl,--end-group
 
 ## Create eeprom
@@ -108,14 +103,13 @@ tools.openocd.upload.params.verbose=-d3
 tools.openocd.upload.params.quiet=-d0
 tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "program {{{build.path}/{build.project_name}.elf}} verify reset"
 
-
 tools.openocd.program.params.verbose=-d3
 tools.openocd.program.params.quiet=-d0
-tools.openocd.program.pattern=
+tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "program {{{build.path}/{build.project_name}.elf}} verify reset"
 
 tools.openocd.erase.params.verbose=-d3
 tools.openocd.erase.params.quiet=-d0
-tools.openocd.erase.pattern=
+tools.openocd.erase.pattern="{path}/{cmd}" {erase.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "program erase"
 
 tools.openocd.bootloader.params.verbose=-d2
 tools.openocd.bootloader.params.quiet=-d0

programmers.txt

@@ -4,3 +4,4 @@ edbg.protocol=
 edbg.program.protocol=
 edbg.program.tool=openocd
 edbg.program.extra_params=
+edbg.build.ldscript=linker_scripts/gcc/flash_without_bootloader.ld