Merge pull request #41 from ladyada/master

fixes & pyportal bootloader
adafruit · Jan 13, 2019 · 79065b9 · 79065b9
2 parents 0d0115a + cfdd5ba
commit 79065b9
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 2 deletions.
diff --git a/boards/grandcentral_m4/board_config.h b/boards/grandcentral_m4/board_config.h
@@ -4,7 +4,7 @@
 #define VENDOR_NAME "Adafruit Industries"
 #define PRODUCT_NAME "Grand Central M4 Express"
 #define VOLUME_LABEL "GCM4BOOT"
-#define INDEX_URL "http://adafru.it/3939"
+#define INDEX_URL "http://adafru.it/4064"
 #define BOARD_ID "SAMD51P20A-GrandCentral-v0"
 
 #define USB_VID 0x239A

diff --git a/boards/itsybitsy_m4/board_config.h b/boards/itsybitsy_m4/board_config.h
@@ -1,6 +1,8 @@
 #ifndef BOARD_CONFIG_H
 #define BOARD_CONFIG_H
 
+#define CRYSTALLESS    1
+
 #define VENDOR_NAME "Adafruit Industries"
 #define PRODUCT_NAME "ItsyBitsy M4 Express"
 #define VOLUME_LABEL "ITSYM4BOOT"

diff --git a/boards/pyportal_m4/board.mk b/boards/pyportal_m4/board.mk
@@ -0,0 +1,2 @@
+CHIP_FAMILY = samd51
+CHIP_VARIANT = SAMD51J20A
diff --git a/boards/pyportal_m4/board_config.h b/boards/pyportal_m4/board_config.h
@@ -0,0 +1,31 @@
+#ifndef BOARD_CONFIG_H
+#define BOARD_CONFIG_H
+
+#define VENDOR_NAME "Adafruit Industries"
+#define PRODUCT_NAME "PyPortal M4 Express"
+#define VOLUME_LABEL "PORTALBOOT"
+#define INDEX_URL "http://adafru.it/"
+#define BOARD_ID "SAMD51J20A-PyPortal-v0"
+
+#define CRYSTALLESS    1
+
+#define USB_VID 0x239A
+#define USB_PID 0x0035
+
+#define LED_PIN PIN_PA27
+
+#define BOARD_NEOPIXEL_PIN PIN_PB22
+#define BOARD_NEOPIXEL_COUNT 1
+
+#define BOOT_USART_MODULE                 SERCOM5
+#define BOOT_USART_MASK                   APBAMASK
+#define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBDMASK_SERCOM5
+#define BOOT_USART_PAD_SETTINGS           UART_RX_PAD1_TX_PAD0
+#define BOOT_USART_PAD3                   PINMUX_UNUSED
+#define BOOT_USART_PAD2                   PINMUX_UNUSED
+#define BOOT_USART_PAD1                   PINMUX_PB03D_SERCOM5_PAD1
+#define BOOT_USART_PAD0                   PINMUX_PB02D_SERCOM5_PAD0
+#define BOOT_GCLK_ID_CORE                 SERCOM0_GCLK_ID_CORE
+#define BOOT_GCLK_ID_SLOW                 SERCOM0_GCLK_ID_SLOW
+
+#endif
diff --git a/inc/uf2.h b/inc/uf2.h
@@ -34,7 +34,7 @@
 #include "uf2_version.h"
 
 // needs to be more than ~4200 (to force FAT16)
-#define NUM_FAT_BLOCKS 8000
+#define NUM_FAT_BLOCKS 16000
 
 // Logging to help debugging
 #define USE_LOGS 0