diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-11-30 14:55:06 -0800 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2018-11-30 14:55:06 -0800 |
| commit | 77760090e26d1493f0c55effe7d228da8a4ac6a6 (patch) | |
| tree | 3d6c0becbfcb350d04447d650a764844ec4456b0 | |
| parent | 95e03092630bbad9949c5fe32cd51e7c29bc065b (diff) | |
Fix up spi flash define
| -rw-r--r-- | ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.h | 7 | ||||
| -rw-r--r-- | ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk | 2 | ||||
| -rw-r--r-- | supervisor/shared/external_flash/devices.h | 7 |
3 files changed, 5 insertions, 11 deletions
diff --git a/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.h b/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.h index ae849d1e2..338e8b7c9 100644 --- a/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.h +++ b/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.h @@ -25,13 +25,6 @@ #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE) -#include "external_flash/devices.h" - -#define EXTERNAL_FLASH_DEVICE_COUNT 1 -#define EXTERNAL_FLASH_DEVICES W25Q16JV_IM - -#include "external_flash/external_flash.h" - #define DEFAULT_I2C_BUS_SCL (&pin_PA13) #define DEFAULT_I2C_BUS_SDA (&pin_PA12) diff --git a/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk b/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk index 4320fd391..a69d2f623 100644 --- a/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk +++ b/ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk @@ -5,6 +5,8 @@ USB_PRODUCT = "Mini SAM M4" USB_MANUFACTURER = "Benjamin Shockley" QSPI_FLASH_FILESYSTEM = 1 +EXTERNAL_FLASH_DEVICE_COUNT = 1 +EXTERNAL_FLASH_DEVICES = "W25Q16JV_IM" LONGINT_IMPL = MPZ CHIP_VARIANT = SAMD51G19A diff --git a/supervisor/shared/external_flash/devices.h b/supervisor/shared/external_flash/devices.h index 86e0868d0..8d8574c47 100644 --- a/supervisor/shared/external_flash/devices.h +++ b/supervisor/shared/external_flash/devices.h @@ -220,10 +220,10 @@ typedef struct { .memory_type = 0x70, \ .capacity = 0x15, \ .max_clock_speed_mhz = 133, \ + .quad_enable_bit_mask = 0x02, \ .has_sector_protection = false, \ .supports_fast_read = true, \ .supports_qspi = true, \ - .has_quad_enable = true, \ .supports_qspi_writes = true, \ .write_status_register_split = false, \ } @@ -254,10 +254,10 @@ typedef struct { .memory_type = 0x70, \ .capacity = 0x16, \ .max_clock_speed_mhz = 133, \ + .quad_enable_bit_mask = 0x02, \ .has_sector_protection = false, \ .supports_fast_read = true, \ .supports_qspi = true, \ - .has_quad_enable = true, \ .supports_qspi_writes = true, \ .write_status_register_split = false, \ } @@ -275,7 +275,6 @@ typedef struct { .has_sector_protection = false, \ .supports_fast_read = true, \ .supports_qspi = true, \ - .has_quad_enable = true, \ .supports_qspi_writes = true, \ .write_status_register_split = false, \ .single_status_byte = false, \ @@ -364,10 +363,10 @@ typedef struct { .memory_type = 0x70, \ .capacity = 0x18, \ .max_clock_speed_mhz = 133, \ + .quad_enable_bit_mask = 0x02, \ .has_sector_protection = false, \ .supports_fast_read = true, \ .supports_qspi = true, \ - .has_quad_enable = true, \ .supports_qspi_writes = true, \ .write_status_register_split = false, \ } |