diff --git a/boards/crickit/board.mk b/boards/crickit/board.mk
new file mode 100644
index 00000000..0a90fdf6
--- /dev/null
+++ b/boards/crickit/board.mk
@@ -0,0 +1,2 @@
+CHIP_FAMILY = samd21
+CHIP_VARIANT = SAMD21G18A
diff --git a/boards/crickit/board_config.h b/boards/crickit/board_config.h
new file mode 100644
index 00000000..62350e00
--- /dev/null
+++ b/boards/crickit/board_config.h
@@ -0,0 +1,19 @@
+#ifndef BOARD_CONFIG_H
+#define BOARD_CONFIG_H
+
+#define VENDOR_NAME "Adafruit Industries"
+#define PRODUCT_NAME "crickit"
+#define VOLUME_LABEL "CRICKITBOOT"
+#define INDEX_URL "http://adafru.it/"
+#define BOARD_ID "SAMD21G18A-crickit-v0"
+
+#define USB_VID 0x239A
+#define USB_PID 0x002D
+
+#define LED_PIN PIN_PB22
+
+#define BOARD_NEOPIXEL_PIN PIN_PA27
+#define BOARD_NEOPIXEL_COUNT 1
+
+
+#endif
diff --git a/boards/itsybitsy_m4/board.mk b/boards/itsybitsy_m4/board.mk
new file mode 100644
index 00000000..0d8d74a9
--- /dev/null
+++ b/boards/itsybitsy_m4/board.mk
@@ -0,0 +1,2 @@
+CHIP_FAMILY = samd51
+CHIP_VARIANT = SAMD51G19A
diff --git a/boards/itsybitsy_m4/board_config.h b/boards/itsybitsy_m4/board_config.h
new file mode 100644
index 00000000..228c8bba
--- /dev/null
+++ b/boards/itsybitsy_m4/board_config.h
@@ -0,0 +1,29 @@
+#ifndef BOARD_CONFIG_H
+#define BOARD_CONFIG_H
+
+#define VENDOR_NAME "Adafruit Industries"
+#define PRODUCT_NAME "ItsyBitsy M4 Express"
+#define VOLUME_LABEL "ITSYM4BOOT"
+#define INDEX_URL "http://adafru.it/"
+#define BOARD_ID "SAMD51G19A-Itsy-v0"
+
+#define USB_VID 0x239A
+#define USB_PID 0x002B
+
+#define LED_PIN PIN_PA22
+
+#define BOARD_RGBLED_CLOCK_PIN            PIN_PB02
+#define BOARD_RGBLED_DATA_PIN             PIN_PB03
+
+#define BOOT_USART_MODULE                 SERCOM3
+#define BOOT_USART_MASK                   APBAMASK
+#define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBBMASK_SERCOM3
+#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_PA22C_SERCOM3_PAD0
+#define BOOT_USART_PAD0                   PINMUX_PA23C_SERCOM3_PAD1
+#define BOOT_GCLK_ID_CORE                 SERCOM3_GCLK_ID_CORE
+#define BOOT_GCLK_ID_SLOW                 SERCOM3_GCLK_ID_SLOW
+
+#endif