decoupling chip specific functions from EXTERNAL_FLASH_QSPI_SINGLE

8 files changed, 106 insertions, 78 deletions

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 7a626dff7..d6b3a543a 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -53,7 +53,7 @@ include $(TOP)/supervisor/supervisor.mk
 # Include make rules and variables common across CircuitPython builds.
 include $(TOP)/py/circuitpy_defns.mk
 
-CROSS_COMPILE = arm-none-eabi-
+CROSS_COMPILE = ~/opt/gcc-arm-none-eabi-9-2019-q4-major/bin/arm-none-eabi-
 
 HAL_DIR=hal/$(MCU_SERIES)
 
diff --git a/ports/atmel-samd/boards/pycubed/mpconfigboard.mk b/ports/atmel-samd/boards/pycubed/mpconfigboard.mk
index adaeecb89..b7b8073ab 100644
--- a/ports/atmel-samd/boards/pycubed/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pycubed/mpconfigboard.mk
@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x04D8
 USB_PID = 0xEC44
 USB_PRODUCT = "PyCubed"
@@ -12,6 +11,8 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = W25Q80DV
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_DRIVE_LABEL = "PYCUBED"
+
 # Not needed.
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_DISPLAYIO = 0
diff --git a/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.h b/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.h
index aca9e3c36..e2a733025 100644
--- a/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.h
+++ b/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.h
@@ -1,4 +1,3 @@
-
 #define MICROPY_HW_BOARD_NAME "PyCubedv04-MRAM"
 #define MICROPY_HW_MCU_NAME "samd51j19"
 #define CIRCUITPY_MCU_FAMILY samd51
@@ -11,8 +10,12 @@
 #define MICROPY_PORT_C        (0)
 #define MICROPY_PORT_D 		  (0)
 
+#define SPI_FLASH_WP_PIN            &pin_PA10
+#define SPI_FLASH_HOLD_PIN          &pin_PA11
+
 // External flash MR2xH40 MRAM
 #define EXTERNAL_FLASH_QSPI_SINGLE
+#define EXTERNAL_FLASH_NO_JEDEC
 
 #define AUTORESET_DELAY_MS 500
 
@@ -34,4 +37,3 @@
 
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
-
diff --git a/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk b/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk
index ef92b4db5..f49bb3fef 100644
--- a/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk
@@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x04D8
 USB_PID = 0xEC44
 USB_PRODUCT = "PyCubed"
@@ -12,13 +11,17 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = MR2xH40
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_DRIVE_LABEL = "PYCUBED"
+
 # Not needed.
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_DISPLAYIO = 0
+CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_GAMEPAD = 0
+CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
\ No newline at end of file
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
diff --git a/ports/atmel-samd/boards/pycubed_mram/pins.c b/ports/atmel-samd/boards/pycubed_mram/pins.c
index 4c97f58a8..e494fb54b 100644
--- a/ports/atmel-samd/boards/pycubed_mram/pins.c
+++ b/ports/atmel-samd/boards/pycubed_mram/pins.c
@@ -40,16 +40,16 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_EN_GPS),   MP_ROM_PTR(&pin_PB01)  },
     { MP_ROM_QSTR(MP_QSTR_TX),       MP_ROM_PTR(&pin_PB02)  },
     { MP_ROM_QSTR(MP_QSTR_RX),       MP_ROM_PTR(&pin_PB03)  },
-    
+
     { MP_ROM_QSTR(MP_QSTR_SDA),      MP_ROM_PTR(&pin_PB12)  },
     { MP_ROM_QSTR(MP_QSTR_SCL),      MP_ROM_PTR(&pin_PB13)  },
 
     { MP_ROM_QSTR(MP_QSTR_WDT_WDI),  MP_ROM_PTR(&pin_PA23)  },
     { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA21)  },
-    
+
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
     { MP_ROM_QSTR(MP_QSTR_I2C),  MP_ROM_PTR(&board_i2c_obj)  },
     { MP_ROM_QSTR(MP_QSTR_SPI),  MP_ROM_PTR(&board_spi_obj)  },
-    
+
 };
-MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
\ No newline at end of file
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/atmel-samd/supervisor/qspi_flash.c b/ports/atmel-samd/supervisor/qspi_flash.c
index fc538f95f..aaed2a0ee 100644
--- a/ports/atmel-samd/supervisor/qspi_flash.c
+++ b/ports/atmel-samd/supervisor/qspi_flash.c
@@ -169,7 +169,7 @@ bool spi_flash_read_data(uint32_t address, uint8_t* data, uint32_t length) {
     #ifdef EXTERNAL_FLASH_QSPI_SINGLE
     QSPI->INSTRCTRL.bit.INSTR = CMD_READ_DATA;
     uint32_t mode = QSPI_INSTRFRAME_WIDTH_SINGLE_BIT_SPI;
-    #elif defined EXTERNAL_FLASH_QSPI_DUAL
+    #elif defined(EXTERNAL_FLASH_QSPI_DUAL)
     QSPI->INSTRCTRL.bit.INSTR = CMD_DUAL_READ;
     uint32_t mode = QSPI_INSTRFRAME_WIDTH_DUAL_OUTPUT;
     #else
diff --git a/supervisor/shared/external_flash/devices.h b/supervisor/shared/external_flash/devices.h
index e148db985..08e38ed91 100644
--- a/supervisor/shared/external_flash/devices.h
+++ b/supervisor/shared/external_flash/devices.h
@@ -64,6 +64,15 @@ typedef struct {
     // True when the status register is a single byte. This implies the Quad Enable bit is in the
     // first byte and the Read Status Register 2 command (0x35) is unsupported.
     bool single_status_byte: 1;
+
+    // Does not support using a ready bit within the status register
+    bool no_ready_bit: 1;
+
+    // Does not support the erase command (0x20)
+    bool no_erase_cmd: 1;
+
+    // Device does not have a reset command
+    bool no_reset_cmd: 1;
 } external_flash_device;
 
 // Settings for the Adesto Tech AT25DF081A 1MiB SPI flash. It's on the SAMD21
@@ -426,14 +435,15 @@ typedef struct {
     .single_status_byte = false, \
 }
 
-// Everspin MRAM
+// Settings for the Everspin MR20H40 / MR25H40 magnetic non-volatile RAM
+// Datasheet: https://www.everspin.com/supportdocs/MR25H40CDFR
 #define MR2xH40 {\
     .total_size = (1 << 22), /* 4 MiB */ \
     .start_up_time_us = 10000, \
     .manufacturer_id = 0xef, /*no JDEC*/ \
     .memory_type = 0x40, /*no JDEC*/ \
     .capacity = 0x14, /*no JDEC*/ \
-    .max_clock_speed_mhz = 40, \
+    .max_clock_speed_mhz = 10, \
     .quad_enable_bit_mask = 0x00, \
     .has_sector_protection = false, \
     .supports_fast_read = false, \
@@ -441,6 +451,9 @@ typedef struct {
     .supports_qspi_writes = false, \
     .write_status_register_split = false, \
     .single_status_byte = true, \
+    .no_ready_bit = true, \
+    .no_erase_cmd = true, \
+    .no_reset_cmd = true, \
 }
 
 // Settings for the Macronix MX25L1606 2MiB SPI flash.
@@ -498,25 +511,6 @@ typedef struct {
     .single_status_byte = true, \
 }
 
-// Settings for the Macronix MX25R1635F 8MiB SPI flash.
-// Datasheet: https://www.macronix.com/Lists/Datasheet/Attachments/7595/MX25R1635F,%20Wide%20Range,%2016Mb,%20v1.6.pdf
-// In low power mode, quad operations can only run at 8 MHz.
-#define MX25R1635F  {\
-    .total_size = (1 << 21), /* 2 MiB */ \
-    .start_up_time_us = 800, \
-    .manufacturer_id = 0xc2, \
-    .memory_type = 0x28, \
-    .capacity = 0x18, \
-    .max_clock_speed_mhz = 33, /* 8 mhz for dual/quad */ \
-    .quad_enable_bit_mask = 0x80, \
-    .has_sector_protection = false, \
-    .supports_fast_read = true, \
-    .supports_qspi = true, \
-    .supports_qspi_writes = true, \
-    .write_status_register_split = false, \
-    .single_status_byte = true, \
-}
-
 // Settings for the Macronix MX25L51245G 64MiB SPI flash.
 // Datasheet: https://www.macronix.com/Lists/Datasheet/Attachments/7437/MX25L51245G,%203V,%20512Mb,%20v1.6.pdf
 #define MX25L51245G  {\
diff --git a/supervisor/shared/external_flash/external_flash.c b/supervisor/shared/external_flash/external_flash.c
index 7f5496d3a..6c14da410 100644
--- a/supervisor/shared/external_flash/external_flash.c
+++ b/supervisor/shared/external_flash/external_flash.c
@@ -59,16 +59,16 @@ static supervisor_allocation* supervisor_cache = NULL;
 static bool wait_for_flash_ready(void) {
     bool ok = true;
     // Both the write enable and write in progress bits should be low.
-    #ifdef EXTERNAL_FLASH_QSPI_SINGLE
+    if (flash_device->no_ready_bit){
         // For NVM without a ready bit in status register
         return ok;
-    #else
+    } else {
         uint8_t read_status_response[1] = {0x00};
         do {
             ok = spi_flash_read_command(CMD_READ_STATUS, read_status_response, 1);
         } while (ok && (read_status_response[0] & 0x3) != 0);
         return ok;
-    #endif
+    }
 }
 
 // Turn on the write enable bit so we can program and erase the flash.
@@ -96,7 +96,8 @@ static bool write_flash(uint32_t address, const uint8_t* data, uint32_t data_len
     }
     // Don't bother writing if the data is all 1s. Thats equivalent to the flash
     // state after an erase.
-    #ifndef EXTERNAL_FLASH_QSPI_SINGLE    
+    if (!flash_device->no_erase_cmd){
+        // Only do this if the device has an erase command
         bool all_ones = true;
         for (uint16_t i = 0; i < data_length; i++) {
             if (data[i] != 0xff) {
@@ -107,7 +108,7 @@ static bool write_flash(uint32_t address, const uint8_t* data, uint32_t data_len
         if (all_ones) {
             return true;
         }
-    #endif
+    }
 
     for (uint32_t bytes_written = 0;
         bytes_written < data_length;
@@ -127,29 +128,34 @@ static bool write_flash(uint32_t address, const uint8_t* data, uint32_t data_len
 static bool page_erased(uint32_t sector_address) {
     // Check the first few bytes to catch the common case where there is data
     // without using a bunch of memory.
-    uint8_t short_buffer[4];
-    if (read_flash(sector_address, short_buffer, 4)) {
-        for (uint16_t i = 0; i < 4; i++) {
-            if (short_buffer[i] != 0xff) {
-                return false;
+    if (flash_device->no_erase_cmd){
+        // skip this if device doesn't have an erase command.
+        return true;
+    } else {
+        uint8_t short_buffer[4];
+        if (read_flash(sector_address, short_buffer, 4)) {
+            for (uint16_t i = 0; i < 4; i++) {
+                if (short_buffer[i] != 0xff) {
+                    return false;
+                }
             }
+        } else {
+            return false;
         }
-    } else {
-        return false;
-    }
 
-    // Now check the full length.
-    uint8_t full_buffer[FILESYSTEM_BLOCK_SIZE];
-    if (read_flash(sector_address, full_buffer, FILESYSTEM_BLOCK_SIZE)) {
-        for (uint16_t i = 0; i < FILESYSTEM_BLOCK_SIZE; i++) {
-            if (short_buffer[i] != 0xff) {
-                return false;
+        // Now check the full length.
+        uint8_t full_buffer[FILESYSTEM_BLOCK_SIZE];
+        if (read_flash(sector_address, full_buffer, FILESYSTEM_BLOCK_SIZE)) {
+            for (uint16_t i = 0; i < FILESYSTEM_BLOCK_SIZE; i++) {
+                if (short_buffer[i] != 0xff) {
+                    return false;
+                }
             }
+        } else {
+            return false;
         }
-    } else {
-        return false;
+        return true;
     }
-    return true;
 }
 
 // Erases the given sector. Make sure you copied all of the data out of it you
@@ -157,12 +163,20 @@ static bool page_erased(uint32_t sector_address) {
 static bool erase_sector(uint32_t sector_address) {
     // Before we erase the sector we need to wait for any writes to finish and
     // and then enable the write again.
-    if (!wait_for_flash_ready() || !write_enable()) {
-        return false;
+    if (flash_device->no_erase_cmd){
+        // skip this if device doesn't have an erase command.
+        return true;
+    } else {
+        if (!wait_for_flash_ready() || !write_enable()) {
+            return false;
+        }
+        if (flash_device->no_erase_cmd) {
+            return true;
+        } else {
+        spi_flash_sector_command(CMD_SECTOR_ERASE, sector_address);
+        return true;
+        }
     }
-
-    spi_flash_sector_command(CMD_SECTOR_ERASE, sector_address);
-    return true;
 }
 
 // Sector is really 24 bits.
@@ -198,20 +212,31 @@ void supervisor_flash_init(void) {
 
     spi_flash_init();
 
-#ifdef EXTERNAL_FLASH_QSPI_SINGLE
-        // For NVM that don't have JEDEC response
-        spi_flash_command(CMD_WAKE);
-        for (uint8_t i = 0; i < EXTERNAL_FLASH_DEVICE_COUNT; i++) {
-            const external_flash_device* possible_device = &possible_devices[i];
+#ifdef EXTERNAL_FLASH_NO_JEDEC
+    // For NVM that don't have JEDEC response
+    spi_flash_command(CMD_WAKE);
+    for (uint8_t i = 0; i < EXTERNAL_FLASH_DEVICE_COUNT; i++) {
+        const external_flash_device* possible_device = &possible_devices[i];
+        flash_device = possible_device;
+        break;
+    }
+#else
+    // The response will be 0xff if the flash needs more time to start up.
+    uint8_t jedec_id_response[3] = {0xff, 0xff, 0xff};
+    while (jedec_id_response[0] == 0xff) {
+        spi_flash_read_command(CMD_READ_JEDEC_ID, jedec_id_response, 3);
+    }
+
+    for (uint8_t i = 0; i < EXTERNAL_FLASH_DEVICE_COUNT; i++) {
+        const external_flash_device* possible_device = &possible_devices[i];
+        if (jedec_id_response[0] == possible_device->manufacturer_id &&
+            jedec_id_response[1] == possible_device->memory_type &&
+            jedec_id_response[2] == possible_device->capacity) {
             flash_device = possible_device;
             break;
+            }
         }
-#else
-        // The response will be 0xff if the flash needs more time to start up.
-        uint8_t jedec_id_response[3] = {0xff, 0xff, 0xff};
-        while (jedec_id_response[0] == 0xff) {
-            spi_flash_read_command(CMD_READ_JEDEC_ID, jedec_id_response, 3);
-        }
+#endif
 
         for (uint8_t i = 0; i < EXTERNAL_FLASH_DEVICE_COUNT; i++) {
             const external_flash_device* possible_device = &possible_devices[i];
@@ -227,20 +252,23 @@ void supervisor_flash_init(void) {
             return;
         }
 
-        // We don't know what state the flash is in so wait for any remaining writes and then reset.
-        uint8_t read_status_response[1] = {0x00};
-        // The write in progress bit should be low.
-        do {
-            spi_flash_read_command(CMD_READ_STATUS, read_status_response, 1);
-        } while ((read_status_response[0] & 0x1) != 0);
-#ifndef EXTERNAL_FLASH_QSPI_SINGLE
+    // We don't know what state the flash is in so wait for any remaining writes and then reset.
+    uint8_t read_status_response[1] = {0x00};
+    // The write in progress bit should be low.
+    do {
+        spi_flash_read_command(CMD_READ_STATUS, read_status_response, 1);
+    } while ((read_status_response[0] & 0x1) != 0);
+
+    if (!(flash_device->no_reset_cmd)){
         // The suspended write/erase bit should be low.
         do {
             spi_flash_read_command(CMD_READ_STATUS2, read_status_response, 1);
         } while ((read_status_response[0] & 0x80) != 0);
+    } else {
         spi_flash_command(CMD_ENABLE_RESET);
         spi_flash_command(CMD_RESET);
-#endif
+    }
+
     // Wait 30us for the reset
     common_hal_mcu_delay_us(30);