Added SAM D51 (m4f) support to bootloader

Author: mattairtech

bootloaders/zero/Makefile

@@ -42,10 +42,14 @@ BOARD_ID?=MT_D21E_rev_B
 # SAMC21G: SAMC21G18A, SAMC21G17A, SAMC21G16A, SAMC21G15A
 # SAMC21E: SAMC21E18A, SAMC21E17A, SAMC21E16A, SAMC21E15A
 # SAMD11:  SAMD11D14AM, SAMD11C14A, SAMD11D14AS
+# SAMD51G: SAMD51G18A, SAMD51G19A
+# SAMD51J: SAMD51J18A, SAMD51J19A, SAMD51J20A
+# SAMD51N: SAMD51N19A, SAMD51N20A
+# SAMD51P: SAMD51P19A, SAMD51P20A
 MCU?=SAMD21E18A
 
-# Note that the makefile can be invoked with values that override the above two settings.
-# For example: BOARD_ID=Generic_D11C14A MCU=SAMD11C14A make
+# 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 ###############################
 
@@ -55,6 +59,12 @@ else
 NAME=sam_ba_$(BOARD_ID)_$(MCU)
 endif
 
+ifeq ($(findstring 20,$(MCU)),20)
+FLASHSIZE=1MB
+endif
+ifeq ($(findstring 19,$(MCU)),19)
+FLASHSIZE=512KB
+endif
 ifeq ($(findstring 18,$(MCU)),18)
 FLASHSIZE=256KB
 endif
@@ -71,7 +81,13 @@ ifeq ($(findstring 14,$(MCU)),14)
 FLASHSIZE=16KB
 endif
 
+ifeq ($(findstring D51,$(MCU)),D51)
+LINKER_SCRIPT?=bootloader_sam_m4f_$(FLASHSIZE).ld
+MCPU=cortex-m4
+else
 LINKER_SCRIPT?=bootloader_sam_m0p_$(FLASHSIZE).ld
+MCPU=cortex-m0plus
+endif
 
 # CORE_VENDOR?=arduino
 CORE_VENDOR?=MattairTech_Arduino
@@ -125,7 +141,8 @@ SIZE=$(ARM_GCC_PATH)size
 # Compiler options
 # eliminate PARANOIA define to save a tiny amount of code (~40B)
 CFLAGS_EXTRA=-D$(SDCARD) -D__$(MCU)__ -DBOARD_ID_$(BOARD_ID) -DPARANOIA
-CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -std=gnu99 -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500 -Wa,-adhlns=$(<:%.c=$(BUILD_DIR)/%.lst)
+CFLAGS=-mthumb -mcpu=$(MCPU) -Wall -c -std=gnu99 -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500 -Wa,-adhlns=$(<:%.c=$(BUILD_DIR)/%.lst)
+
 ifdef DEBUG
   CFLAGS+=-g3 -O1 -DDEBUG=1
 else
@@ -141,7 +158,7 @@ INCLUDES=-I"$(MODULE_PATH_ARDUINO)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE
 
 # -----------------------------------------------------------------------------
 # Linker options
-LDFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all
+LDFLAGS=-mthumb -mcpu=$(MCPU) -Wall -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all
 LDFLAGS+=-Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols --specs=nano.specs --specs=nosys.specs
 
 # -----------------------------------------------------------------------------

bootloaders/zero/README.md

@@ -34,8 +34,11 @@ void setBaud (uint32_t baud)
   while(SDCARD_SPI_MODULE->SPI.SYNCBUSY.bit.ENABLE);
 
   //Synchronous arithmetic
-  SDCARD_SPI_MODULE->SPI.BAUD.reg = ((VARIANT_MCK / (2 * baud)) - 1);
-
+  #if (SAMD51 && (VARIANT_MCK == 120000000ul))
+    SDCARD_SPI_MODULE->SPI.BAUD.reg = ((96000000ul / (2 * baud)) - 1); // Use 96MHz SERCOM clock (100MHz maximum) when cpu running at 120MHz
+  #else
+    SDCARD_SPI_MODULE->SPI.BAUD.reg = ((VARIANT_MCK / (2 * baud)) - 1);
+  #endif
 
   SDCARD_SPI_MODULE->SPI.CTRLA.bit.ENABLE = 1;
   while(SDCARD_SPI_MODULE->SPI.SYNCBUSY.bit.ENABLE);
@@ -65,6 +68,13 @@ inline void init_spi (void)
   #elif (SAMC21G) || (SAMC21J)
   MCLK->APBCMASK.reg |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 | MCLK_APBCMASK_SERCOM4 | MCLK_APBCMASK_SERCOM5 ;
   #endif
+#elif (SAMD51)
+  MCLK->APBAMASK.reg |= MCLK_APBAMASK_SERCOM0 | MCLK_APBAMASK_SERCOM1 ;
+  MCLK->APBBMASK.reg |= MCLK_APBBMASK_SERCOM2 | MCLK_APBBMASK_SERCOM3 ;
+  MCLK->APBDMASK.reg |= MCLK_APBDMASK_SERCOM4 | MCLK_APBDMASK_SERCOM5 ;
+  #if (SAMD51N) || (SAMD51P)
+  MCLK->APBDMASK.reg |= MCLK_APBDMASK_SERCOM6 | MCLK_APBDMASK_SERCOM7 ;
+  #endif
 #else
   #error "mmcbbp.c: Unsupported microcontroller"
 #endif
@@ -79,8 +89,12 @@ inline void init_spi (void)
 #if (SAMD21 || SAMD11)
   GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( SDCARD_SPI_PER_CLOCK_INDEX ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
   waitForSync();
-#elif (SAML21 || SAMC21)
-  GCLK->PCHCTRL[SDCARD_SPI_PER_CLOCK_INDEX].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+#elif (SAML21 || SAMC21 || SAMD51)
+  #if (SAMD51 && (VARIANT_MCK == 120000000ul))
+    GCLK->PCHCTRL[SDCARD_SPI_PER_CLOCK_INDEX].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK6 ); // Use 96MHz SERCOM clock (100MHz maximum) when cpu running at 120MHz
+  #else
+    GCLK->PCHCTRL[SDCARD_SPI_PER_CLOCK_INDEX].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+  #endif
   waitForSync();
 #else
   #error "mmcbbp.c: Unsupported microcontroller"

bootloaders/zero/SDCard/mmcbbp.c

@@ -104,7 +104,7 @@ bool flashVerify (void)
     pf_read(Buff, FLASH_PAGE_SIZE, &br);       /* Load a page data */
 
     if (br) {
-      for (uint8_t i=0; i<br; i++) {
+      for (uint16_t i=0; i<br; i++) {
         if (Buff[i] != *((BYTE *)(fa + i))) {
           return (false);
         }