Merge pull request #432 from adafruit/exp_flash_interface

add QSPI define for external flash

Author: hathach

boards.txt

@@ -114,9 +114,9 @@ feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
 
 
 # ----------------------------------
-# Bluefruit Feather nRF52840 sense
+# Feather Bluefruit sense
 # ----------------------------------
-feather52840sense.name=Adafruit Feather nRF52840 Sense
+feather52840sense.name=Adafruit Feather Bluefruit Sense
 
 # VID/PID for bootloader with/without UF2, Arduino + Circuitpython App
 feather52840sense.vid.0=0x239A
@@ -144,7 +144,7 @@ feather52840sense.build.board=NRF52840_FEATHER_SENSE
 feather52840sense.build.core=nRF5
 feather52840sense.build.variant=feather_nrf52840_sense
 feather52840sense.build.usb_manufacturer="Adafruit LLC"
-feather52840sense.build.usb_product="Feather nRF52840 Sense"
+feather52840sense.build.usb_product="Feather Bluefruit Sense"
 feather52840sense.build.extra_flags=-DNRF52840_XXAA {build.flags.usb}
 feather52840sense.build.ldscript=nrf52840_s140_v6.ld
 feather52840sense.build.vid=0x239A

variants/circuitplayground_nrf52840/variant.h

@@ -131,6 +131,7 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 
 // On-board QSPI Flash
 #define EXTERNAL_FLASH_DEVICES   GD25Q16C
+#define EXTERNAL_FLASH_USE_QSPI
 
 #define USB_MSC_BLOCK_SIZE    512
 #define USB_MSC_BLOCK_COUNT   ((2*1024*1024) / USB_MSC_BLOCK_SIZE)

variants/clue_nrf52840/variant.h

@@ -131,6 +131,7 @@ static const uint8_t SCK1  = PIN_SPI1_SCK ;
 
 // On-board QSPI Flash
 #define EXTERNAL_FLASH_DEVICES   GD25Q16C
+#define EXTERNAL_FLASH_USE_QSPI
 
 #define USB_MSC_BLOCK_SIZE    512
 #define USB_MSC_BLOCK_COUNT   ((2*1024*1024) / USB_MSC_BLOCK_SIZE)

variants/feather_nrf52840_express/variant.h

@@ -128,6 +128,7 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 
 // On-board QSPI Flash
 #define EXTERNAL_FLASH_DEVICES   GD25Q16C
+#define EXTERNAL_FLASH_USE_QSPI
 
 #define USB_MSC_BLOCK_SIZE    512
 #define USB_MSC_BLOCK_COUNT   ((2*1024*1024) / USB_MSC_BLOCK_SIZE)

variants/feather_nrf52840_sense/variant.h

@@ -132,6 +132,7 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 
 // On-board QSPI Flash
 #define EXTERNAL_FLASH_DEVICES   GD25Q16C
+#define EXTERNAL_FLASH_USE_QSPI
 
 #define USB_MSC_BLOCK_SIZE    512
 #define USB_MSC_BLOCK_COUNT   ((2*1024*1024) / USB_MSC_BLOCK_SIZE)

variants/itsybitsy_nrf52840_express/variant.h

@@ -124,6 +124,7 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 
 // On-board QSPI Flash
 #define EXTERNAL_FLASH_DEVICES   GD25Q16C
+#define EXTERNAL_FLASH_USE_QSPI
 
 #define USB_MSC_BLOCK_SIZE    512
 #define USB_MSC_BLOCK_COUNT   ((2*1024*1024) / USB_MSC_BLOCK_SIZE)

variants/metro_nrf52840_express/variant.h

@@ -130,6 +130,11 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 // On-board QSPI Flash
 // If EXTERNAL_FLASH_DEVICES is not defined, all supported devices will be used
 #define EXTERNAL_FLASH_DEVICES   GD25Q16C
+#define EXTERNAL_FLASH_USE_QSPI
+
+#define USB_MSC_BLOCK_SIZE    512
+#define USB_MSC_BLOCK_COUNT   ((2*1024*1024) / USB_MSC_BLOCK_SIZE)
+
 
 #ifdef __cplusplus
 }

variants/particle_xenon/variant.h

@@ -182,6 +182,7 @@ static const uint8_t SCK1  = PIN_SPI1_SCK;
 
 // On-board QSPI Flash
 #define EXTERNAL_FLASH_DEVICES   GD25Q16C
+#define EXTERNAL_FLASH_USE_QSPI
 
 #define USB_MSC_BLOCK_SIZE    512
 #define USB_MSC_BLOCK_COUNT   ((2*1024*1024) / USB_MSC_BLOCK_SIZE)

variants/pca10056/variant.h

@@ -135,6 +135,7 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 
 // On-board QSPI Flash
 #define EXTERNAL_FLASH_DEVICES   MX25R6435F
+#define EXTERNAL_FLASH_USE_QSPI
 
 #define USB_MSC_BLOCK_SIZE    512
 #define USB_MSC_BLOCK_COUNT   ((8*1024*1024) / USB_MSC_BLOCK_SIZE)