Merge pull request arduino#32 from adafruit/merge-samd51

Merge samd51

Author: ladyada

Diff for: .gitignore

@@ -1,4 +1,5 @@
 *.bz2
+*.atsuo
 
 bootloaders/*/build/
 *~

Diff for: README.md

@@ -1,18 +1,50 @@
-# Arduino Core for SAMD21 CPU
+# Arduino Core for SAMD21 and SAMD51 CPU
 
 This repository contains the source code and configuration files of the Arduino Core
-for Atmel's SAMD21 processor (used on the Arduino/Genuino Zero, MKR1000 and MKRZero boards).
+for Atmel's SAMD21 and SAMD51 processor (used on the Arduino/Genuino Zero, MKR1000 and MKRZero boards).
 
 In particular, this adds support for the Adafruit SAMD Boards such as the Feather M0
 
 ## Installation on Arduino IDE
 
-Install the Adafruit Board Support package json and then install the Adafruit SAMD board package
+This is a detailed process for now!
 
-https://learn.adafruit.com/adafruit-feather-m0-basic-proto/using-with-arduino-ide
+1. Install Arduino IDE 1.8.5 or greater
+2. Remove the Adafruit SAMD board support package if you have installed it
+3. make a folder in your ArduinoSketchFolder called "hardware", then make a folder "hardware/Adafruit"
+4. in "hardware/Adafruit" git clone https://github.com/adafruit/ArduinoCore-samd, and rename the folder "samd"
+5. Check you now have "ArduinoSketcheFolderName/hardware/Adafruit/samd/boards.txt"
+6. git checkout samd51 from within the cloned repo, and check boards.txt contains "# Adafruit Metro M4 (SAMD51)"
+7. Now we need to update CMSIS! Download https://github.com/adafruit/ArduinoModule-CMSIS-Atmel/archive/master.zip and unzip
+8. Find your Arduino CMSIS, in Mac its "~/Library/Arduino15/packages/arduino/tools/CMSIS-Atmel/1.1.0/CMSIS" version # may vary, you'll need "Go to folder..." feature in the Finder to get to " ~/Library/Arduino15" as it is hidden. In Windows it is "C:\Users\yourusername\AppData\Local\Arduino15\packages\arduino\tools\CMSIS-Atmel\1.1.0\CMSIS" Inside is a folder named Device
+
+For Linux: the Arduino stuff is located in ~/.arduino15/packages/arduino/tools/CMSIS-Atmel/1.1.0/CMSIS
+
+9. Inside the downloaded CMSIS zip, go into the CMSIS-Atmel/CMSIS folder, you should see a folder named Device. *DRAG THE DEVICE FOLDER ONLY* from the zip to your arduino Library folder so that Device is merged with Device. It will replace a bunch of files.
+
+For Linux, it may be better to just delete the original Device Folder then copy over the new one - the drag/drop worked ok on MACOS, but not so well on my Linux box.  
+
+10. You will also need to replace bossac. For Windows or Mac: Go here https://github.com/adafruit/BOSSA/releases and download either windows exe or mac app of latest bossac. unzip.  Go to Step 12.
+
+For Linux users it is best to build a copy of bossac locally - 
+clone the Adafruit Repostitory to somewhere on your local machine.
+```
+git clone https://github.com/adafruit/BOSSA.git
+change to the arduino branch
+git checkout arduino
+```
+Follow the instructions to build bossac in README.md or at https://github.com/adafruit/BOSSA/tree/arduino.
+
+11. Replace the binary at ".../Library/Arduino15/packages/arduino/tools/bossac/1.7.0/bossac" or "...\AppData\Local\Arduino15\packages\arduino\tools\bossac\1.7.0\bossac"
+12. On Windows 7 you will also need to install the updated serial driver, download https://github.com/adafruit/Adafruit_Windows_Drivers/archive/master.zip to get all the drivers, and point the Device Manager to the unzipped folder. It isn't signed, so just approve the installation manually.
+13. That's it!
 
 ## Bugs or Issues
 
+## Known Issues for SAMD51:
+* AREF must be tied to 3.3V for dac to work. This is a bug in the SAMD51 silicon.
+* USB host mode doesn't work yet
+
 If you find a bug you can submit an issue here on github:
 
 https://github.com/adafruit/ArduinoCore-samd

Diff for: boards.txt

@@ -32,7 +32,7 @@ adafruit_feather_m0.build.usb_product="Feather M0"
 adafruit_feather_m0.build.usb_manufacturer="Adafruit"
 adafruit_feather_m0.build.board=SAMD_FEATHER_M0
 adafruit_feather_m0.build.core=arduino
-adafruit_feather_m0.build.extra_flags=-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ {build.usb_flags}
+adafruit_feather_m0.build.extra_flags=-DARDUINO_SAMD_ZERO -DARM_MATH_CM0PLUS -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.variant=feather_m0
@@ -41,6 +41,7 @@ adafruit_feather_m0.build.vid=0x239A
 adafruit_feather_m0.build.pid=0x800B
 adafruit_feather_m0.bootloader.tool=openocd
 adafruit_feather_m0.bootloader.file=feather/samd21_sam_ba.bin
+adafruit_feather_m0.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
 
 adafruit_feather_m0_express.name=Adafruit Feather M0 Express
 adafruit_feather_m0_express.vid.0=0x239A
@@ -59,7 +60,7 @@ adafruit_feather_m0_express.build.usb_product="Feather M0 Express"
 adafruit_feather_m0_express.build.usb_manufacturer="Adafruit"
 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 -DADAFRUIT_FEATHER_M0_EXPRESS -D__SAMD21G18A__ {build.usb_flags}
+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.variant=feather_m0_express
@@ -68,6 +69,7 @@ adafruit_feather_m0_express.build.vid=0x239A
 adafruit_feather_m0_express.build.pid=0x801B
 adafruit_feather_m0_express.bootloader.tool=openocd
 adafruit_feather_m0_express.bootloader.file=feather/samd21_sam_ba.bin
+adafruit_feather_m0_express.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
 
 #adafruit_radio_m0.name=Adafruit M0 Radio (Native USB Port)
 #adafruit_radio_m0.vid.0=0x239A
@@ -86,7 +88,7 @@ adafruit_feather_m0_express.bootloader.file=feather/samd21_sam_ba.bin
 #adafruit_radio_m0.build.usb_manufacturer="Adafruit"
 #adafruit_radio_m0.build.board=SAMD_ZERO
 #adafruit_radio_m0.build.core=arduino
-#adafruit_radio_m0.build.extra_flags=-D__SAMR21G18A__ {build.usb_flags}
+#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.variant=zero_radio
@@ -113,7 +115,7 @@ adafruit_metro_m0.build.usb_product="Metro M0 Express"
 adafruit_metro_m0.build.usb_manufacturer="Adafruit"
 adafruit_metro_m0.build.board=SAMD_ZERO
 adafruit_metro_m0.build.core=arduino
-adafruit_metro_m0.build.extra_flags=-D__SAMD21G18A__  -DARDUINO_SAMD_ZERO -DADAFRUIT_METRO_M0_EXPRESS {build.usb_flags}
+adafruit_metro_m0.build.extra_flags=-D__SAMD21G18A__  -DARDUINO_SAMD_ZERO -DARM_MATH_CM0PLUS -DADAFRUIT_METRO_M0_EXPRESS {build.usb_flags}
 adafruit_metro_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
 adafruit_metro_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
 adafruit_metro_m0.build.variant=metro_m0
@@ -122,6 +124,7 @@ adafruit_metro_m0.build.vid=0x239A
 adafruit_metro_m0.build.pid=0x8013
 adafruit_metro_m0.bootloader.tool=openocd
 adafruit_metro_m0.bootloader.file=metro/bootloader_uf2.bin
+adafruit_metro_m0.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
 
 # Adafruit Circuit Playground M0
 # ------------------------------
@@ -142,7 +145,7 @@ adafruit_circuitplayground_m0.build.usb_product="Circuit Playground Express"
 adafruit_circuitplayground_m0.build.usb_manufacturer="Adafruit"
 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__ -DADAFRUIT_CIRCUITPLAYGROUND_M0 {build.usb_flags}
+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.variant=circuitplay
@@ -151,6 +154,7 @@ adafruit_circuitplayground_m0.build.vid=0x239A
 adafruit_circuitplayground_m0.build.pid=0x8018
 adafruit_circuitplayground_m0.bootloader.tool=openocd
 adafruit_circuitplayground_m0.bootloader.file=circuitplay/bootloader_uf2.bin
+adafruit_circuitplayground_m0.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
 
 adafruit_gemma_m0.name=Adafruit Gemma M0
 adafruit_gemma_m0.vid.0=0x239A
@@ -234,6 +238,7 @@ adafruit_itsybitsy_m0.build.vid=0x239A
 adafruit_itsybitsy_m0.build.pid=0x800F
 adafruit_itsybitsy_m0.bootloader.tool=openocd
 adafruit_itsybitsy_m0.bootloader.file=itsybitsy/samd21_sam_ba.bin
+adafruit_itsybitsy_m0.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
 
 
 adafruit_pirkey.name=Adafruit pIRkey
@@ -261,4 +266,66 @@ adafruit_pirkey.build.variant_system_lib=
 adafruit_pirkey.build.vid=0x239A
 adafruit_pirkey.build.pid=0x801E
 adafruit_pirkey.bootloader.tool=openocd
-adafruit_pirkey.bootloader.file=pirkey/bootloader_uf2.bin
+adafruit_pirkey.bootloader.file=pirkey/bootloader_uf2.bin
+adafruit_pirkey.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
+
+
+# Adafruit Metro M4 (SAMD51)
+# ------------------------------
+adafruit_metro_m4.name=Adafruit Metro M4 (SAMD51)
+adafruit_metro_m4.vid.0=0x239A
+adafruit_metro_m4.pid.0=0x8020
+adafruit_metro_m4.vid.1=0x239A
+adafruit_metro_m4.pid.1=0x0020
+adafruit_metro_m4.upload.tool=bossac
+adafruit_metro_m4.upload.protocol=sam-ba
+adafruit_metro_m4.upload.maximum_size=507904
+adafruit_metro_m4.upload.use_1200bps_touch=true
+adafruit_metro_m4.upload.wait_for_upload_port=true
+adafruit_metro_m4.upload.native_usb=true
+adafruit_metro_m4.build.mcu=cortex-m4
+adafruit_metro_m4.build.f_cpu=48000000L
+adafruit_metro_m4.build.usb_product="Adafruit Metro M4"
+adafruit_metro_m4.build.usb_manufacturer="Adafruit LLC"
+adafruit_metro_m4.build.board=METRO_M4
+adafruit_metro_m4.build.core=arduino
+adafruit_metro_m4.build.extra_flags=-D__SAMD51J19A__ -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16
+adafruit_metro_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+adafruit_metro_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_metro_m4.build.variant=metro_m4
+adafruit_metro_m4.build.variant_system_lib=
+adafruit_metro_m4.build.vid=0x239A
+adafruit_metro_m4.build.pid=0x8020
+adafruit_metro_m4.bootloader.tool=openocd
+adafruit_metro_m4.bootloader.file=metroM4/bootloader.bin
+adafruit_metro_m4.compiler.arm.cmsis.ldflags="-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
+
+# Adafruit Feather M4 (SAMD51)
+# ------------------------------
+#adafruit_feather_m4.name=Adafruit Feather M4 (SAMD51)
+#adafruit_feather_m4.vid.0=0x239A
+#adafruit_feather_m4.pid.0=0x8022
+#adafruit_feather_m4.vid.1=0x239A
+#adafruit_feather_m4.pid.1=0x0022
+#adafruit_feather_m4.upload.tool=bossac
+#adafruit_feather_m4.upload.protocol=sam-ba
+#adafruit_feather_m4.upload.maximum_size=507904
+#adafruit_feather_m4.upload.use_1200bps_touch=true
+#adafruit_feather_m4.upload.wait_for_upload_port=true
+#adafruit_feather_m4.upload.native_usb=true
+#adafruit_feather_m4.build.mcu=cortex-m4
+#adafruit_feather_m4.build.f_cpu=48000000L
+#adafruit_feather_m4.build.usb_product="Adafruit Feather M4"
+#adafruit_feather_m4.build.usb_manufacturer="Adafruit LLC"
+#adafruit_feather_m4.build.board=FEATHER_M4
+#adafruit_feather_m4.build.core=arduino
+#adafruit_feather_m4.build.extra_flags=-D__SAMD51G19A__ -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16
+#adafruit_feather_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+#adafruit_feather_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
+#adafruit_feather_m4.build.variant=feather_m4
+#adafruit_feather_m4.build.variant_system_lib=
+#adafruit_feather_m4.build.vid=0x239A
+#adafruit_feather_m4.build.pid=0x8022
+#adafruit_feather_m4.bootloader.tool=openocd
+#adafruit_feather_m4.bootloader.file=metroM4/bootloader.bin
+#adafruit_feather_m4.compiler.arm.cmsis.ldflags="-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16

Diff for: bootloaders/metroM4/bootloader.bin

@@ -67,9 +67,9 @@
 class HardwareSerial : public Stream
 {
   public:
-    virtual void begin(unsigned long);
-    virtual void begin(unsigned long baudrate, uint16_t config);
-    virtual void end();
+    virtual void begin(unsigned long) {}
+    virtual void begin(unsigned long baudrate, uint16_t config) {}
+    virtual void end() {}
     virtual int available(void) = 0;
     virtual int peek(void) = 0;
     virtual int read(void) = 0;

Diff for: bootloaders/metroM4/update-bootloader.bin

@@ -30,40 +30,72 @@ extern "C" {
 extern const uint32_t __text_start__;
 #define APP_START ((volatile uint32_t)(&__text_start__) + 4)
 
+#else
+
+#if defined(__SAMD51__)
+#define APP_START 0x00004004
 #else
 #define APP_START 0x00002004
 #endif
 
+#endif
+
 static inline bool nvmReady(void) {
+#if defined(__SAMD51__)
+		return NVMCTRL->STATUS.reg & NVMCTRL_STATUS_READY;
+#else
         return NVMCTRL->INTFLAG.reg & NVMCTRL_INTFLAG_READY;
+#endif
 }
 
 __attribute__ ((long_call, section (".ramfunc")))
 static void banzai() {
 	// Disable all interrupts
 	__disable_irq();
+	
+#if defined(__SAMD51__)
+	//THESE MUST MATCH THE BOOTLOADER
+	#define DOUBLE_TAP_MAGIC 			0xf01669efUL
+	#define BOOT_DOUBLE_TAP_ADDRESS     (HSRAM_ADDR + HSRAM_SIZE - 4)
+
+	unsigned long *a = (unsigned long *)BOOT_DOUBLE_TAP_ADDRESS;
+	*a = DOUBLE_TAP_MAGIC;
+	//NVMCTRL->ADDR.reg  = APP_START;
+	//NVMCTRL->CTRLB.reg = NVMCTRL_CTRLB_CMD_EB | NVMCTRL_CTRLB_CMDEX_KEY;
+	
+	// Reset the device
+	NVIC_SystemReset() ;
 
+	while (true);
+#else
+	
 	// Avoid erasing the application if APP_START is < than the minimum bootloader size
 	// This could happen if without_bootloader linker script was chosen
 	// Minimum bootloader size in SAMD21 family is 512bytes (RM section 22.6.5)
+	
 	if (APP_START < (0x200 + 4)) {
 		goto reset;
 	}
+	
 
 	// Erase application
 	while (!nvmReady())
 		;
+
 	NVMCTRL->STATUS.reg |= NVMCTRL_STATUS_MASK;
 	NVMCTRL->ADDR.reg  = (uintptr_t)&NVM_MEMORY[APP_START / 4];
 	NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMD_ER | NVMCTRL_CTRLA_CMDEX_KEY;
+	
 	while (!nvmReady())
-		;
+	;
 
 reset:
 	// Reset the device
 	NVIC_SystemReset() ;
 
 	while (true);
+#endif
+
 }
 
 static int ticks = -1;