Merge branch 'master' of github.com:adafruit/ArduinoCore-samd

Author: ladyada

programmers.txt

@@ -34,3 +34,10 @@ 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;

variants/circuitplay/openocd_scripts/circuit_play.cfg

@@ -0,0 +1,32 @@
+#
+#  Adafruit Circuit Playground 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
+#
+
+interface jlink
+transport select swd
+reset_config none separate
+
+# chip name
+set CHIPNAME at91samd21g18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]

variants/feather_m0_express/openocd_scripts/feather_m0_express.cfg

@@ -0,0 +1,32 @@
+#
+#  Adafruit Feather M0 Express 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
+#
+
+interface jlink
+transport select swd
+reset_config none separate
+
+# chip name
+set CHIPNAME at91samd21g18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]

variants/feather_m4/variant.h

@@ -175,10 +175,11 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 #define I2S_DEVICE          0
 #define I2S_CLOCK_GENERATOR 3
 
-#define PIN_I2S_SDO          (5u)
-#define PIN_I2S_SDI          PIN_SPI_MOSI
-#define PIN_I2S_SCK          PIN_A2
-#define PIN_I2S_FS           PIN_SPI_MISO
+#define PIN_I2S_SDO          (11u)
+#define PIN_I2S_SDI          (12u)
+#define PIN_I2S_SCK          PIN_SERIAL1_TX
+#define PIN_I2S_FS           (10u)
+#define PIN_I2S_MCK          PIN_SERIAL1_RX
 
 //QSPI Pins
 #define PIN_QSPI_SCK    (34u)

variants/circuitplay/openocd_scripts/arduino_zero.cfg renamed to variants/gemma_m0/openocd_scripts/gemma_m0.cfg

@@ -1,5 +1,5 @@
 #
-#  Arduino Zero OpenOCD script.
+#  Adafruit Gemma M0 OpenOCD script.
 #
 #  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
 #
@@ -18,7 +18,9 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-source [find interface/cmsis-dap.cfg]
+interface jlink
+transport select swd
+reset_config none separate
 
 # chip name
 set CHIPNAME at91samd21g18

variants/hallowing_m0_express/openocd_scripts/arduino_zero.cfg

@@ -0,0 +1,32 @@
+#
+#  Adafruit Hallowing M0 Express 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
+#
+
+interface jlink
+transport select swd
+reset_config none separate
+
+# chip name
+set CHIPNAME at91samd21g18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]

variants/hallowing_m0_express/openocd_scripts/hallowing_m0_express.cfg

@@ -1,5 +1,5 @@
 #
-#  Arduino Zero OpenOCD script.
+#  Adafruit ItsyBitsy M0 OpenOCD script.
 #
 #  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
 #
@@ -18,7 +18,9 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-source [find interface/cmsis-dap.cfg]
+interface jlink
+transport select swd
+reset_config none separate
 
 # chip name
 set CHIPNAME at91samd21g18