Adding bootload pin support to bootloader.

Author: Jim Lindblom

Firmware/Bootloader/Makefile

@@ -58,7 +58,8 @@ SIZE=$(ARM_GCC_PATH)size
 # -----------------------------------------------------------------------------
 # Boards definitions
 BOARD_ID?=sparkfun_9dof
-NAME?=SparkFun_9DoF_Razor
+NAME?=SparkFun_9DoF_Razor_M0
+#SparkFun_9DoF_Razor
 
 # -----------------------------------------------------------------------------
 # Compiler options

Firmware/Bootloader/SparkFun_9DoF_Razor.hex

@@ -27,6 +27,8 @@
   #include "board_definitions_genuino_mkr1000.h"
 #elif defined(BOARD_ID_sparkfun_9dof)
   #include "board_definitions_sparkfun_9dofRazor.h"
+#elif defined(BOARD_ID_sparkfun_samd21_dev)
+  #include "board_definitions_sparkfun_samd21dev.h"
 #else
   #error You must define a BOARD_ID and add the corresponding definitions in board_definitions.h
 #endif

Firmware/Bootloader/SparkFun_9DoF_Razor.bin renamed to Firmware/Bootloader/SparkFun_9DoF_Razor_M0.bin

@@ -42,8 +42,7 @@
  * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
  * pin is tied LOW.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA21 // Pin 7
-//#define BOOT_LOAD_PIN                     PIN_PA15 // Pin 5
+#define BOOT_LOAD_PIN                     PIN_PA23 // PA23 is SCL on the 9DoF Razor
 
 #define BOOT_USART_MODULE                 SERCOM0
 #define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM0
@@ -54,7 +53,6 @@
 #define BOOT_USART_PAD1                   PINMUX_UNUSED
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
-
 /* Master clock frequency */
 #define CPU_FREQUENCY                     (48000000ul)
 #define VARIANT_MCK                       CPU_FREQUENCY

Firmware/Bootloader/SparkFun_9DoF_Razor_M0.hex

@@ -0,0 +1,81 @@
+/*
+  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_
+
+/*
+ * USB device definitions
+ */
+#define STRING_PRODUCT "SparkFun SAMD21"
+#define USB_VID_HIGH   0x1B
+#define USB_VID_LOW    0x4F
+#define USB_PID_HIGH   0x8D
+#define USB_PID_LOW    0x21
+
+/*
+ * If BOOT_DOUBLE_TAP_ADDRESS is defined the bootloader is started by
+ * quickly tapping two times on the reset button.
+ * BOOT_DOUBLE_TAP_ADDRESS must point to a free SRAM cell that must not
+ * be touched from the loaded application.
+ */
+#define BOOT_DOUBLE_TAP_ADDRESS           (0x20007FFCul)
+#define BOOT_DOUBLE_TAP_DATA              (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))
+
+/*
+ * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
+ * pin is tied LOW.
+ */
+//#define BOOT_LOAD_PIN                     PIN_PA21 // Pin 7
+//#define BOOT_LOAD_PIN                     PIN_PA15 // Pin 5
+
+#define BOOT_USART_MODULE                 SERCOM0
+#define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM0
+#define BOOT_USART_PER_CLOCK_INDEX        GCLK_ID_SERCOM0_CORE
+#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
+
+
+/* Master clock frequency */
+#define CPU_FREQUENCY                     (48000000ul)
+#define VARIANT_MCK                       CPU_FREQUENCY
+
+/* Frequency of the board main oscillator */
+#define VARIANT_MAINOSC                   (32768ul)
+
+/* Calibration values for DFLL48 pll */
+#define NVM_SW_CALIB_DFLL48M_COARSE_VAL   (58)
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (64)
+
+/*
+ * LEDs definitions
+ */
+#define BOARD_LED_PORT                    (0)
+#define BOARD_LED_PIN                     (17)
+
+#define BOARD_LEDRX_PORT                  (1)
+#define BOARD_LEDRX_PIN                   (3)
+
+#define BOARD_LEDTX_PORT                  (0)
+#define BOARD_LEDTX_PIN                   (27)
+
+#endif // _BOARD_DEFINITIONS_H_

Firmware/Bootloader/board_definitions.h

@@ -108,7 +108,7 @@ uint32_t* pulSketch_Start_Address;
     return;
   }
 
-/*
+
 #if defined(BOOT_LOAD_PIN)
   volatile PortGroup *boot_port = (volatile PortGroup *)(&(PORT->Group[BOOT_LOAD_PIN / 32]));
   volatile bool boot_en;
@@ -127,7 +127,7 @@ uint32_t* pulSketch_Start_Address;
     return;
   }
 #endif
-*/
+
 
 //  LED_on();