fix typo, add more board openocd configs, link in boards.txt (arduino#82)

brentru · ladyada · commit 2443eac3acd9 · 2019-01-23T11:05:52.000-05:00
diff --git a/boards.txt b/boards.txt
@@ -36,7 +36,7 @@ adafruit_feather_m0.build.board=SAMD_ZERO
 adafruit_feather_m0.build.core=arduino
 adafruit_feather_m0.build.extra_flags=-DARDUINO_SAMD_ZERO -DARM_MATH_CM0PLUS  -DADAFRUIT_FEATHER_M0 -D__SAMD21G18A__ {build.usb_flags}
 adafruit_feather_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_feather_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_feather_m0.build.openocdscript=openocd_scripts/feather_m0.cfg
 adafruit_feather_m0.build.variant=feather_m0
 adafruit_feather_m0.build.variant_system_lib=
 adafruit_feather_m0.build.vid=0x239A
@@ -64,7 +64,7 @@ adafruit_feather_m0_express.build.board=SAMD_FEATHER_M0_EXPRESS
 adafruit_feather_m0_express.build.core=arduino
 adafruit_feather_m0_express.build.extra_flags=-DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARM_MATH_CM0PLUS -DADAFRUIT_FEATHER_M0_EXPRESS -D__SAMD21G18A__ {build.usb_flags}
 adafruit_feather_m0_express.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_feather_m0_express.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_feather_m0_express.build.openocdscript=openocd_scripts/feather_m0_express.cfg
 adafruit_feather_m0_express.build.variant=feather_m0_express
 adafruit_feather_m0_express.build.variant_system_lib=
 adafruit_feather_m0_express.build.vid=0x239A
@@ -91,7 +91,7 @@ adafruit_feather_m0_express.bootloader.file=featherM0/bootloader-feather_m0-v2.0
 #adafruit_radio_m0.build.core=arduino
 #adafruit_radio_m0.build.extra_flags=-D__SAMR21G18A__ -DARM_MATH_CM0PLUS {build.usb_flags}
 #adafruit_radio_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-#adafruit_radio_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+#adafruit_radio_m0.build.openocdscript=openocd_scripts/zero_radio.cfg
 #adafruit_radio_m0.build.variant=zero_radio
 #adafruit_radio_m0.build.variant_system_lib=
 #adafruit_radio_m0.build.vid=0x239A
@@ -150,7 +150,7 @@ adafruit_circuitplayground_m0.build.board=SAMD_CIRCUITPLAYGROUND_EXPRESS
 adafruit_circuitplayground_m0.build.core=arduino
 adafruit_circuitplayground_m0.build.extra_flags=-DCRYSTALLESS -DARDUINO_SAMD_ZERO -D__SAMD21G18A__ -DARM_MATH_CM0PLUS -DADAFRUIT_CIRCUITPLAYGROUND_M0 {build.usb_flags}
 adafruit_circuitplayground_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_circuitplayground_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_circuitplayground_m0.build.openocdscript=openocd_scripts/circuit_play.cfg
 adafruit_circuitplayground_m0.build.variant=circuitplay
 adafruit_circuitplayground_m0.build.variant_system_lib=
 adafruit_circuitplayground_m0.build.vid=0x239A
@@ -178,7 +178,7 @@ adafruit_gemma_m0.build.board=GEMMA_M0
 adafruit_gemma_m0.build.core=arduino
 adafruit_gemma_m0.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_GEMMA_M0 -D__SAMD21E18A__ -DARM_MATH_CM0PLUS {build.usb_flags}
 adafruit_gemma_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_gemma_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_gemma_m0.build.openocdscript=openocd_scripts/gemma_m0.cfg
 adafruit_gemma_m0.build.variant=gemma_m0
 adafruit_gemma_m0.build.variant_system_lib=
 adafruit_gemma_m0.build.vid=0x239A
@@ -206,7 +206,7 @@ adafruit_trinket_m0.build.board=TRINKET_M0
 adafruit_trinket_m0.build.core=arduino
 adafruit_trinket_m0.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_TRINKET_M0 -D__SAMD21E18A__ -DARM_MATH_CM0PLUS {build.usb_flags}
 adafruit_trinket_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_trinket_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_trinket_m0.build.openocdscript=openocd_scripts/trinket_m0.cfg
 adafruit_trinket_m0.build.variant=trinket_m0
 adafruit_trinket_m0.build.variant_system_lib=
 adafruit_trinket_m0.build.vid=0x239A
@@ -236,7 +236,7 @@ adafruit_itsybitsy_m0.build.board=ITSYBITSY_M0
 adafruit_itsybitsy_m0.build.core=arduino
 adafruit_itsybitsy_m0.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_ITSYBITSY_M0 -D__SAMD21G18A__ -DARM_MATH_CM0PLUS {build.usb_flags}
 adafruit_itsybitsy_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_itsybitsy_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_itsybitsy_m0.build.openocdscript=openocd_scripts/itsybitsy_m0.cfg
 adafruit_itsybitsy_m0.build.variant=itsybitsy_m0
 adafruit_itsybitsy_m0.build.variant_system_lib=
 adafruit_itsybitsy_m0.build.vid=0x239A
@@ -437,7 +437,7 @@ adafruit_hallowing.build.board=SAMD_HALLOWING
 adafruit_hallowing.build.core=arduino
 adafruit_hallowing.build.extra_flags=-DCRYSTALLESS -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_HALLOWING_M0 -DARM_MATH_CM0PLUS -DADAFRUIT_HALLOWING -D__SAMD21G18A__ {build.usb_flags}
 adafruit_hallowing.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_hallowing.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_hallowing.build.openocdscript=openocd_scripts/hallowing_m0_express.cfg
 adafruit_hallowing.build.variant=hallowing_m0_express
 adafruit_hallowing.build.variant_system_lib=
 adafruit_hallowing.build.vid=0x239A
@@ -505,7 +505,7 @@ adafruit_crickit_m0.build.board=CRICKIT_M0
 adafruit_crickit_m0.build.core=arduino
 adafruit_crickit_m0.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_CRICKIT_M0 -D__SAMD21G18A__ -DARM_MATH_CM0PLUS {build.usb_flags}
 adafruit_crickit_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_crickit_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_crickit_m0.build.openocdscript=openocd_scripts/crickit_m0.cfg
 adafruit_crickit_m0.build.variant=crickit_m0
 adafruit_crickit_m0.build.variant_system_lib=
 adafruit_crickit_m0.build.vid=0x239A
diff --git a/programmers.txt b/programmers.txt
@@ -19,7 +19,7 @@ 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;
+adafruit_jlink.program.setup_command=interface jlink; transport select swd; reset_config none separate; set WORKAREASIZE 0;
 
 
 adafruit_atmel_ice.name=Atmel-ICE over OpenOCD
diff --git a/variants/circuitplay/openocd_scripts/circuit_play.cfg b/variants/circuitplay/openocd_scripts/circuit_play.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
diff --git a/variants/crickit_m0/openocd_scripts/cricket_m0.cfg b/variants/crickit_m0/openocd_scripts/cricket_m0.cfg
@@ -1,5 +1,5 @@
 #
-#  Arduino Zero OpenOCD script.
+#  Adafruit Crickit M0 OpenOCD script.
 #
 #  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
 #
@@ -18,8 +18,6 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-source [find interface/cmsis-dap.cfg]
-
 # chip name
 set CHIPNAME at91samd21g18
 set ENDIAN little
diff --git a/variants/feather_m0/openocd_scripts/feather_m0.cfg b/variants/feather_m0/openocd_scripts/feather_m0.cfg
@@ -1,5 +1,5 @@
 #
-#  Arduino Zero OpenOCD script.
+#  Adafruit Feather M0 Express OpenOCD script.
 #
 #  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
 #
@@ -18,8 +18,6 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-source [find interface/cmsis-dap.cfg]
-
 # chip name
 set CHIPNAME at91samd21g18
 set ENDIAN little
diff --git a/variants/feather_m0_express/openocd_scripts/feather_m0_express.cfg b/variants/feather_m0_express/openocd_scripts/feather_m0_express.cfg
@@ -1,5 +1,5 @@
 #
-#  Adafruit Feather M0 Express OpenOCD script.
+#  Adafruit Feather M0 OpenOCD script.
 #
 #  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
 #
@@ -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
diff --git a/variants/gemma_m0/openocd_scripts/gemma_m0.cfg b/variants/gemma_m0/openocd_scripts/gemma_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
diff --git a/variants/hallowing_m0_express/openocd_scripts/hallowing_m0_express.cfg b/variants/hallowing_m0_express/openocd_scripts/hallowing_m0_express.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
diff --git a/variants/itsybitsy_m0/openocd_scripts/itsybitsy_m0.cfg b/variants/itsybitsy_m0/openocd_scripts/itsybitsy_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
diff --git a/variants/trinket_m0/openocd_scripts/trinket_m0.cfg b/variants/trinket_m0/openocd_scripts/trinket_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
diff --git a/variants/zero_radio/openocd_scripts/zero_radio.cfg b/variants/zero_radio/openocd_scripts/zero_radio.cfg
@@ -0,0 +1,28 @@
+#
+#  Adafruit Feather M0 Radio OpenOCD script.
+#
+#  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#  See the GNU Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+# chip name
+set CHIPNAME at91samd21g18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Arduino Zero OpenOCD script.`
	`2`	`+# Adafruit Crickit M0 OpenOCD script.`
`3`	`3`	`#`
`4`	`4`	`# Copyright (c) 2014-2015 Arduino LLC. All right reserved.`
`5`	`5`	`#`
`@@ -18,8 +18,6 @@`
`18`	`18`	`# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA`
`19`	`19`	`#`
`20`	`20`
`21`		`-source [find interface/cmsis-dap.cfg]`
`22`		`-`
`23`	`21`	`# chip name`
`24`	`22`	`set CHIPNAME at91samd21g18`
`25`	`23`	`set ENDIAN little`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Arduino Zero OpenOCD script.`
	`2`	`+# Adafruit Feather M0 Express OpenOCD script.`
`3`	`3`	`#`
`4`	`4`	`# Copyright (c) 2014-2015 Arduino LLC. All right reserved.`
`5`	`5`	`#`
`@@ -18,8 +18,6 @@`
`18`	`18`	`# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA`
`19`	`19`	`#`
`20`	`20`
`21`		`-source [find interface/cmsis-dap.cfg]`
`22`		`-`
`23`	`21`	`# chip name`
`24`	`22`	`set CHIPNAME at91samd21g18`
`25`	`23`	`set ENDIAN little`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Adafruit Feather M0 Express OpenOCD script.`
	`2`	`+# Adafruit Feather M0 OpenOCD script.`
`3`	`3`	`#`
`4`	`4`	`# Copyright (c) 2014-2015 Arduino LLC. All right reserved.`
`5`	`5`	`#`
`@@ -18,10 +18,6 @@`
`18`	`18`	`# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA`
`19`	`19`	`#`
`20`	`20`
`21`		`-interface jlink`
`22`		`-transport select swd`
`23`		`-reset_config none separate`
`24`		`-`
`25`	`21`	`# chip name`
`26`	`22`	`set CHIPNAME at91samd21g18`
`27`	`23`	`set ENDIAN little`