jlink openocd fixes (needs testing on non-windows)

Author: ladyada

boards.txt

@@ -119,7 +119,7 @@ adafruit_metro_m0.build.board=SAMD_ZERO
 adafruit_metro_m0.build.core=arduino
 adafruit_metro_m0.build.extra_flags=-D__SAMD21G18A__  -DARDUINO_SAMD_ZERO -DARM_MATH_CM0PLUS -DADAFRUIT_METRO_M0_EXPRESS {build.usb_flags}
 adafruit_metro_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_metro_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_metro_m0.build.openocdscript=openocd_scripts/metro_m0.cfg
 adafruit_metro_m0.build.variant=metro_m0
 adafruit_metro_m0.build.variant_system_lib=
 adafruit_metro_m0.build.vid=0x239A

platform.txt

@@ -157,9 +157,9 @@ tools.openocd.erase.params.verbose=-d3
 tools.openocd.erase.params.quiet=-d0
 tools.openocd.erase.pattern=
 
-tools.openocd.bootloader.params.verbose=-d2
+tools.openocd.bootloader.params.verbose=-d3
 tools.openocd.bootloader.params.quiet=-d0
-tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify reset; shutdown"
+tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f interface/{program.protocol}.cfg -c "{program.setup_command}" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify reset; shutdown"
 
 #
 # OpenOCD sketch upload - version with configurable bootloader size

programmers.txt

@@ -14,30 +14,17 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-edbg.name=Atmel EDBG
-edbg.communication=USB
-edbg.protocol=
-edbg.program.protocol=
-edbg.program.tool=openocd
-edbg.program.extra_params=
+adafruit_jlink.name=J-Link over OpenOCD
+adafruit_jlink.communication=USB
+adafruit_jlink.protocol=jlink
+adafruit_jlink.program.protocol=jlink
+adafruit_jlink.program.tool=openocd
+adafruit_jlink.program.setup_command=interface jlink; ransport select swd; reset_config none separate; set WORKAREASIZE 0;
 
-atmel_ice.name=Atmel-ICE
-atmel_ice.communication=USB
-atmel_ice.protocol=
-atmel_ice.program.protocol=
-atmel_ice.program.tool=openocd
-atmel_ice.program.extra_params=
 
-sam_ice.name=Atmel SAM-ICE
-sam_ice.communication=USB
-sam_ice.protocol=
-sam_ice.program.protocol=
-sam_ice.program.tool=openocd
-sam_ice.program.extra_params=
-
-jlink.name=J-Link
-jlink.communication=USB
-jlink.protocol=jlink
-jlink.program.protocol=jlink
-jlink.program.tool=openocd
-jlink.program.setup_command=transport select swd; set WORKAREASIZE 0;
+adafruit_atmel_ice.name=Atmel-ICE over OpenOCD
+adafruit_atmel_ice.communication=USB
+adafruit_atmel_ice.protocol=cmsis-dap
+adafruit_atmel_ice.program.protocol=cmsis-dap
+adafruit_atmel_ice.program.tool=openocd
+adafruit_atmel_ice.program.setup_command=cmsis_dap_vid_pid 0x03eb 0x2141; transport select swd;

variants/metro_m0/openocd_scripts/metro_m0.cfg

@@ -18,10 +18,6 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-interface jlink
-transport select swd
-reset_config none separate
-
 # chip name
 set CHIPNAME at91samd21g18
 set ENDIAN little