Refactor, OpenOCD chip-erase

bootloaders/zero/Makefile

@@ -28,7 +28,7 @@ SDCARD?=SDCARD_DISABLED
 # Xeno, Xeno_Mini, MT_D21E_rev_A, MT_D21E_rev_B, MT_D11
 # arduino_zero, arduino_mkrzero, arduino_mkr1000, arduino_mkrfox1200, genuino_mkr1000, genuino_zero, arduino_m0, arduino_m0_pro
 # Generic_x21E, Generic_x21G, Generic_x21J, Generic_D11D14AM, Generic_D11D14AS, Generic_D11C14A
-BOARD_ID?=Xeno_Mini
+BOARD_ID?=Generic_x21E
 
 # -----------------------------------------------------------------------------
 # MCU definitions:
@@ -46,17 +46,17 @@ BOARD_ID?=Xeno_Mini
 # SAMD51J: SAMD51J18A, SAMD51J19A, SAMD51J20A
 # SAMD51N: SAMD51N19A, SAMD51N20A
 # SAMD51P: SAMD51P19A, SAMD51P20A
-MCU?=SAMD51G19A
+MCU?=SAMD21E17A
 
 # Note that the makefile can be invoked with values that override the above settings.
 # For example: BOARD_ID=Generic_D11C14A MCU=SAMD11C14A SDCARD=SDCARD_DISABLED make
 
 # End Config ###############################
 
 ifeq ($(findstring ENABLED,$(SDCARD)),ENABLED)
-NAME=sam_ba_sdcard_$(BOARD_ID)_$(MCU)
+NAME=sam_ba_sdcard_$(MCU)
 else
-NAME=sam_ba_$(BOARD_ID)_$(MCU)
+NAME=sam_ba_$(MCU)
 endif
 
 ifeq ($(findstring 20,$(MCU)),20)
@@ -90,7 +90,7 @@ MCPU=cortex-m0plus
 endif
 
 # CORE_VENDOR?=arduino
-CORE_VENDOR?=MattairTech_Arduino
+CORE_VENDOR?=Fab_SAM_Arduino
 
 # -----------------------------------------------------------------------------
 # Paths

bootloaders/zero/board_definitions.h

@@ -27,6 +27,14 @@
   #include "board_definitions/board_definitions_Generic_x21G.h"
 #elif defined(BOARD_ID_Generic_x21J)
   #include "board_definitions/board_definitions_Generic_x21J.h"
+#elif defined(BOARD_ID_Generic_D51G)
+  #include "board_definitions/board_definitions_Generic_D51G.h"
+#elif defined(BOARD_ID_Generic_D51J)
+  #include "board_definitions/board_definitions_Generic_D51J.h"
+#elif defined(BOARD_ID_Generic_D51N)
+  #include "board_definitions/board_definitions_Generic_D51N.h"
+#elif defined(BOARD_ID_Generic_D51P)
+  #include "board_definitions/board_definitions_Generic_D51P.h"
 #elif defined(BOARD_ID_Generic_D11D14AM)
   #include "board_definitions/board_definitions_Generic_D11D14AM.h"
 #elif defined(BOARD_ID_Generic_D11D14AS)

bootloaders/zero/board_definitions/board_definitions_Generic_D11C14A.h

@@ -197,13 +197,13 @@
  * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
-#define STRING_MANUFACTURER "MattairTech LLC"
+#define STRING_MANUFACTURER "Fab Foundation"
 #define STRING_PRODUCT "Generic SAMD11C14A"
 
 /* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
-#define USB_PID_HIGH   0x05
+#define USB_PID_HIGH   0x15
 #define USB_PID_LOW    0x57
 
 /* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.

bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AM.h

@@ -197,13 +197,13 @@
  * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
-#define STRING_MANUFACTURER "MattairTech LLC"
+#define STRING_MANUFACTURER "Fab Foundation"
 #define STRING_PRODUCT "Generic SAMD11D14AM"
 
 /* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
-#define USB_PID_HIGH   0x05
+#define USB_PID_HIGH   0x35
 #define USB_PID_LOW    0x57
 
 /* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.

bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AS.h

@@ -197,13 +197,13 @@
  * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
-#define STRING_MANUFACTURER "MattairTech LLC"
+#define STRING_MANUFACTURER "Fab Foundation"
 #define STRING_PRODUCT "Generic SAMD11D14AS"
 
 /* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
-#define USB_PID_HIGH   0x05
+#define USB_PID_HIGH   0x25
 #define USB_PID_LOW    0x57
 
 /* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.

bootloaders/zero/board_definitions/board_definitions_Generic_D51G.h

@@ -0,0 +1,279 @@
+/*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  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
+*/
+
+#ifndef _BOARD_DEFINITIONS_H_
+#define _BOARD_DEFINITIONS_H_
+
+#include <sam.h>
+
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+#ifndef SDCARD_ENABLED
+//#define SDCARD_ENABLED
+#endif
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-2/CMSIS/Device/ATMEL/sam<d21|d51|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      1
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA16C_SERCOM1_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PA18C_SERCOM1_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PA19C_SERCOM1_PAD3
+
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (23)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (3)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (4)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
+ */
+#define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#if (SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES)
+  // The pin functions as a toggle between the two interfaces
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_USBCDC_LOW
+#else
+  // The pin functions as an enable for the compiled interface
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#endif
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (5)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
+ * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
+ */
+#define ARDUINO_EXTENDED_CAPABILITIES   1
+
+/* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
+ * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
+ * or CLOCKCONFIG_INTERNAL_USB. If CLOCKCONFIG_32768HZ_CRYSTAL or
+ * CLOCKCONFIG_HS_CRYSTAL is defined, then the PLL will be used. If
+ * CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ must
+ * also be defined with the crystal frequency in Hertz. CLOCKCONFIG_INTERNAL
+ * uses the DFLL in open-loop mode, except with the C21 which lacks a DFLL, so
+ * the internal 48MHz RC oscillator is used instead. CLOCKCONFIG_INTERNAL_USB
+ * can be defined for the D21, D11, L21, or D51. It will also use the DFLL in
+ * open-loop mode, except when connected to a USB port with data lines (and
+ * not suspended), where it will calibrate against the USB SOF signal.
+ */
+#ifndef CLOCKCONFIG_CLOCK_SOURCE
+  #define CLOCKCONFIG_CLOCK_SOURCE	CLOCKCONFIG_INTERNAL_USB
+#endif
+
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+#define HS_CRYSTAL_FREQUENCY_HERTZ	16000000UL
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+//#define PLL_FRACTIONAL_ENABLED
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+//#define PLL_FAST_STARTUP
+
+/* Master clock frequency (also Fcpu frequency). With the D51,
+ * this can be either 120000000ul or 48000000ul. See README.md.
+ */
+#define VARIANT_MCK                       (120000000ul)
+//#define VARIANT_MCK                       (48000000ul)
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
+/* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
+ */
+#define USB_VENDOR_STRINGS_ENABLED
+#define STRING_MANUFACTURER "Fab Foundation"
+#define STRING_PRODUCT "Generic SAMD51G"
+
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
+#define USB_VID_HIGH   0x16
+#define USB_VID_LOW    0xD0
+#define USB_PID_HIGH   0x75
+#define USB_PID_LOW    0x57
+
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-2/
+ * CMSIS/Device/ATMEL/sam<d21|d51|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
+#define BOOT_USART_SERCOM_INSTANCE        0
+#define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
+#define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
+#define BOOT_USART_PAD2                   PINMUX_PA10C_SERCOM0_PAD2
+#define BOOT_USART_PAD1                   PINMUX_UNUSED
+#define BOOT_USART_PAD0                   PINMUX_UNUSED
+
+/*
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
+ */
+#define BOOT_DOUBLE_TAP_ENABLED
+
+/*
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
+ */
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (27)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
+
+/*
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
+ */
+#define BOARD_LED_FADE_ENABLED
+
+/*
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
+ */
+#if defined(SDCARD_ENABLED)
+  #define BOARD_LED_PORT                    (0)
+  #define BOARD_LED_PIN                     (6)
+  #define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#else
+  //#define BOARD_LED_PORT                    (0)
+  //#define BOARD_LED_PIN                     (6)
+  //#define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#endif
+
+//#define BOARD_LEDRX_PORT                  (0)
+//#define BOARD_LEDRX_PIN                   (6)
+//#define BOARD_LEDRX_POLARITY	LED_POLARITY_HIGH_ON
+
+//#define BOARD_LEDTX_PORT                  (0)
+//#define BOARD_LEDTX_PIN                   (6)
+//#define BOARD_LEDTX_POLARITY	LED_POLARITY_HIGH_ON
+
+#endif // _BOARD_DEFINITIONS_H_