11 files changed, 5 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml
index 1df36d43d..4c8a2f529 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ script:
   - make -C mpy-cross
   - make -C atmel-samd BOARD=arduino_zero
   - make -C atmel-samd BOARD=feather_m0_basic
-  - make -C atmel-samd BOARD=feather_m0_flash
+  - make -C atmel-samd BOARD=feather_m0_express
   - make -C atmel-samd BOARD=metro_m0_flash
   - make -C atmel-samd BOARD=cplay_m0_flash
   - make -C atmel-samd BOARD=trinket_m0
diff --git a/atmel-samd/boards/feather_m0_flash/conf_access.h b/atmel-samd/boards/feather_m0_express/conf_access.h
index 25109b75c..2326bfcdf 100644
--- a/atmel-samd/boards/feather_m0_flash/conf_access.h
+++ b/atmel-samd/boards/feather_m0_express/conf_access.h
@@ -76,7 +76,7 @@
 #define Lun_0_removal                           vfs_removal
 #define Lun_0_usb_read_10                       vfs_usb_read_10
 #define Lun_0_usb_write_10                      vfs_usb_write_10
-#define LUN_0_NAME                              "\"MicroPython VFS[0]\""
+#define LUN_0_NAME                              "\"CircuitPython VFS[0]\""
 //! @}
 
 #define MEM_USB                                 LUN_USB
diff --git a/atmel-samd/boards/feather_m0_flash/conf_board.h b/atmel-samd/boards/feather_m0_express/conf_board.h
index 7b88c97fc..7b88c97fc 100644
--- a/atmel-samd/boards/feather_m0_flash/conf_board.h
+++ b/atmel-samd/boards/feather_m0_express/conf_board.h
diff --git a/atmel-samd/boards/feather_m0_flash/conf_clocks.h b/atmel-samd/boards/feather_m0_express/conf_clocks.h
index d3f3e6496..d3f3e6496 100644
--- a/atmel-samd/boards/feather_m0_flash/conf_clocks.h
+++ b/atmel-samd/boards/feather_m0_express/conf_clocks.h
diff --git a/atmel-samd/boards/feather_m0_flash/conf_usb.h b/atmel-samd/boards/feather_m0_express/conf_usb.h
index 125e42d66..8453b48fd 100644
--- a/atmel-samd/boards/feather_m0_flash/conf_usb.h
+++ b/atmel-samd/boards/feather_m0_express/conf_usb.h
@@ -19,7 +19,7 @@
 #endif
 
 #ifndef USB_DEVICE_PRODUCT_NAME
-#  define USB_DEVICE_PRODUCT_NAME "Feather M0 Basic"
+#  define USB_DEVICE_PRODUCT_NAME "Feather M0 Express"
 #endif
 
 #define  USB_DEVICE_GET_SERIAL_NAME_POINTER  serial_number
diff --git a/atmel-samd/boards/feather_m0_flash/init.c b/atmel-samd/boards/feather_m0_express/init.c
index 88608c0fb..88608c0fb 100644
--- a/atmel-samd/boards/feather_m0_flash/init.c
+++ b/atmel-samd/boards/feather_m0_express/init.c
diff --git a/atmel-samd/boards/feather_m0_flash/mpconfigboard.h b/atmel-samd/boards/feather_m0_express/mpconfigboard.h
index 52987c68a..9fd01d446 100644
--- a/atmel-samd/boards/feather_m0_flash/mpconfigboard.h
+++ b/atmel-samd/boards/feather_m0_express/mpconfigboard.h
@@ -1,28 +1,12 @@
-// LEDs
 #define USB_REPL
 
-#define MICROPY_HW_BOARD_NAME "Adafruit Feather M0 Flash"
+#define MICROPY_HW_BOARD_NAME "Adafruit Feather M0 Express"
 #define MICROPY_HW_MCU_NAME "samd21g18"
 
-// Rev. A
-// #define MICROPY_HW_NEOPIXEL &pin_PA14
-
-// Rev. B
 #define MICROPY_HW_NEOPIXEL &pin_PA06
 
 #define SPI_FLASH_BAUDRATE  (1000000)
 
-// On-board flash
-// Rev A.
-// #define SPI_FLASH_MUX_SETTING SPI_SIGNAL_MUX_SETTING_E
-// #define SPI_FLASH_PAD0_PINMUX PINMUX_PA12D_SERCOM4_PAD0 // MISO
-// // Use default pinmux for the chip select since we manage it ourselves.
-// #define SPI_FLASH_PAD1_PINMUX PINMUX_DEFAULT // CS
-// #define SPI_FLASH_PAD2_PINMUX PINMUX_PB10D_SERCOM4_PAD2 // MOSI
-// #define SPI_FLASH_PAD3_PINMUX PINMUX_PB11D_SERCOM4_PAD3 // SCK
-// #define SPI_FLASH_SERCOM      SERCOM4
-
-// Rev B.
 #define SPI_FLASH_MUX_SETTING SPI_SIGNAL_MUX_SETTING_C
 #define SPI_FLASH_PAD0_PINMUX PINMUX_PA08D_SERCOM2_PAD0 // MOSI
 // Use default pinmux for the chip select since we manage it ourselves.
@@ -33,11 +17,6 @@
 
 #define SPI_FLASH_CS          PIN_PA13
 
-// Rev. A
-// #define MICROPY_PORT_A        (PORT_PA12 | PORT_PA13 | PORT_PA14 | PORT_PA24 | PORT_PA25)
-// #define MICROPY_PORT_B        (PORT_PB10 | PORT_PB11)
-
-// Rev. B
 #define MICROPY_PORT_A        (PORT_PA06 | PORT_PA08 | PORT_PA09 | PORT_PA14 | PORT_PA13 | PORT_PA14 | PORT_PA24 | PORT_PA25)
 #define MICROPY_PORT_B        ( 0 )
 
diff --git a/atmel-samd/boards/feather_m0_flash/mpconfigboard.mk b/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
index 8b6d61bbb..8b6d61bbb 100644
--- a/atmel-samd/boards/feather_m0_flash/mpconfigboard.mk
+++ b/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
diff --git a/atmel-samd/boards/feather_m0_flash/pins.c b/atmel-samd/boards/feather_m0_express/pins.c
index 06a245ca4..06a245ca4 100644
--- a/atmel-samd/boards/feather_m0_flash/pins.c
+++ b/atmel-samd/boards/feather_m0_express/pins.c
diff --git a/atmel-samd/boards/feather_m0_flash/touch.h b/atmel-samd/boards/feather_m0_express/touch.h
index a3fd1184f..a3fd1184f 100644
--- a/atmel-samd/boards/feather_m0_flash/touch.h
+++ b/atmel-samd/boards/feather_m0_express/touch.h
diff --git a/tools/build_adafruit_bins.sh b/tools/build_adafruit_bins.sh
index d412d030b..83b18547c 100755
--- a/tools/build_adafruit_bins.sh
+++ b/tools/build_adafruit_bins.sh
@@ -1,7 +1,7 @@
 rm -rf atmel-samd/build*
 rm -rf esp8266/build*
 
-ATMEL_BOARDS="arduino_zero cplay_m0_flash feather_m0_basic feather_m0_adalogger feather_m0_flash metro_m0_flash trinket_m0 gemma_m0"
+ATMEL_BOARDS="arduino_zero cplay_m0_flash feather_m0_basic feather_m0_adalogger feather_m0_express metro_m0_flash trinket_m0 gemma_m0"
 
 for board in $ATMEL_BOARDS; do
     make -C atmel-samd BOARD=$board