Skip to content

Commit fd7dcff

Browse files
committed
Add Feather M4 Express support.
* Also fixed detection of SPI flash chip to correct look in the 2+ spots. * Added support for using QSPI in dual read mode.
1 parent 00eacbf commit fd7dcff

File tree

9 files changed

+124
-5
lines changed

9 files changed

+124
-5
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ env:
1111
- TRAVIS_BOARD=feather_m0_rfm69
1212
- TRAVIS_BOARD=feather_m0_rfm9x
1313
- TRAVIS_BOARD=feather_m0_express
14+
- TRAVIS_BOARD=feather_m4_express
1415
- TRAVIS_BOARD=itsybitsy_m0_express
1516
- TRAVIS_BOARD=metro_m0_express
1617
- TRAVIS_BOARD=metro_m4_express
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include "boards/board.h"
28+
#include "mpconfigboard.h"
29+
30+
void board_init(void) {
31+
}
32+
33+
bool board_requests_safe_mode(void) {
34+
return false;
35+
}
36+
37+
void reset_board(void) {
38+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#define MICROPY_HW_BOARD_NAME "Feather M4 Express"
2+
#define MICROPY_HW_MCU_NAME "samd51j19"
3+
4+
#define CIRCUITPY_MCU_FAMILY samd51
5+
6+
// This is for Rev C which is green
7+
8+
#define MICROPY_HW_NEOPIXEL (&pin_PB23)
9+
10+
// These are pins not to reset.
11+
// QSPI Data pins and TX LED
12+
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09)
13+
// RX LED, QSPI CS, QSPI SCK and NeoPixel pin
14+
#define MICROPY_PORT_B (PORT_PB10 | PORT_PB11 | PORT_PB23 )
15+
#define MICROPY_PORT_C (0)
16+
#define MICROPY_PORT_D (0)
17+
18+
#define AUTORESET_DELAY_MS 500
19+
20+
// If you change this, then make sure to update the linker scripts as well to
21+
// make sure you don't overwrite code
22+
// #define CIRCUITPY_INTERNAL_NVM_SIZE 256
23+
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
24+
25+
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
26+
27+
#include "external_flash/devices.h"
28+
29+
#define EXTERNAL_FLASH_DEVICE_COUNT 2
30+
#define EXTERNAL_FLASH_DEVICES W25Q16FW, GD25Q16C
31+
32+
#define EXTERNAL_FLASH_QSPI_DUAL
33+
34+
#include "external_flash/external_flash.h"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
LD_FILE = boards/samd51x19-bootloader-external-flash.ld
2+
USB_VID = 0x239A
3+
USB_PID = 0x8021
4+
USB_PRODUCT = "Feather M4 Express"
5+
USB_MANUFACTURER = "Adafruit Industries LLC"
6+
7+
QSPI_FLASH_FILESYSTEM = 1
8+
9+
CHIP_VARIANT = SAMD51J19A
10+
CHIP_FAMILY = samd51
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#include "samd21_pins.h"
2+
3+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
5+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA05) },
6+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB08) },
7+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PB09) },
8+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA06) },
9+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA10) },
10+
{ MP_ROM_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_PA03) },
11+
12+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA17) },
13+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA19) },
14+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA18) },
15+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA07) },
16+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA07) },
17+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA04) },
18+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA04) },
19+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12) },
20+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13) },
21+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA14) },
22+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA15) },
23+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA16) },
24+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA20) },
25+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA21) },
26+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA22) },
27+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA23) },
28+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PB23) },
29+
};
30+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

ports/atmel-samd/external_flash/common_commands.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#define CMD_READ_STATUS 0x05
3838
#define CMD_READ_STATUS2 0x35
3939
#define CMD_WRITE_STATUS_BYTE1 0x01
40+
#define CMD_DUAL_READ 0x3b
4041
#define CMD_QUAD_READ 0x6b
4142
#define CMD_ENABLE_RESET 0x66
4243
#define CMD_RESET 0x99

ports/atmel-samd/external_flash/external_flash.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,11 @@ void external_flash_init(void) {
185185
if (flash_device != NULL) {
186186
return;
187187
}
188-
uint8_t num_possible_devices = sizeof(*possible_devices) / sizeof(external_flash_device);
189188

190189
// Delay to give the SPI Flash time to get going.
191190
// TODO(tannewt): Only do this when we know power was applied vs a reset.
192191
uint16_t max_start_up_delay_us = 0;
193-
for (uint8_t i = 0; i < num_possible_devices; i++) {
192+
for (uint8_t i = 0; i < EXTERNAL_FLASH_DEVICE_COUNT; i++) {
194193
if (possible_devices[i].start_up_time_us > max_start_up_delay_us) {
195194
max_start_up_delay_us = possible_devices[i].start_up_time_us;
196195
}
@@ -205,9 +204,8 @@ void external_flash_init(void) {
205204
spi_flash_read_command(CMD_READ_JEDEC_ID, jedec_id_response, 3);
206205
}
207206

208-
for (uint8_t i = 0; i < num_possible_devices; i++) {
207+
for (uint8_t i = 0; i < EXTERNAL_FLASH_DEVICE_COUNT; i++) {
209208
const external_flash_device* possible_device = &possible_devices[i];
210-
211209
if (jedec_id_response[0] == possible_device->manufacturer_id &&
212210
jedec_id_response[1] == possible_device->memory_type &&
213211
jedec_id_response[2] == possible_device->capacity) {

ports/atmel-samd/external_flash/qspi_flash.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include <stdint.h>
3030
#include <string.h>
3131

32+
#include "mpconfigboard.h" // for EXTERNAL_FLASH_QSPI_DUAL
33+
3234
#include "external_flash/common_commands.h"
3335
#include "shared_dma.h"
3436

@@ -139,8 +141,13 @@ bool spi_flash_write_data(uint32_t address, uint8_t* data, uint32_t length) {
139141
}
140142

141143
bool spi_flash_read_data(uint32_t address, uint8_t* data, uint32_t length) {
144+
#ifdef EXTERNAL_FLASH_QSPI_DUAL
145+
QSPI->INSTRCTRL.bit.INSTR = CMD_DUAL_READ;
146+
uint32_t mode = QSPI_INSTRFRAME_WIDTH_DUAL_OUTPUT;
147+
#else
142148
QSPI->INSTRCTRL.bit.INSTR = CMD_QUAD_READ;
143149
uint32_t mode = QSPI_INSTRFRAME_WIDTH_QUAD_OUTPUT;
150+
#endif
144151

145152
QSPI->INSTRFRAME.reg = mode |
146153
QSPI_INSTRFRAME_ADDRLEN_24BITS |

tools/build_adafruit_bins.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ rm -rf ports/atmel-samd/build*
22
rm -rf ports/esp8266/build*
33
rm -rf ports/nrf/build*
44

5-
ATMEL_BOARDS="arduino_zero circuitplayground_express feather_m0_basic feather_m0_adalogger itsybitsy_m0_express feather_m0_rfm69 feather_m0_rfm9x feather_m0_express metro_m0_express metro_m4_express pirkey_m0 trinket_m0 gemma_m0 feather52"
5+
ATMEL_BOARDS="arduino_zero circuitplayground_express feather_m0_basic feather_m0_adalogger itsybitsy_m0_express feather_m0_rfm69 feather_m0_rfm9x feather_m0_express feather_m4_express metro_m0_express metro_m4_express pirkey_m0 trinket_m0 gemma_m0 feather52"
66
ROSIE_SETUPS="rosie-ci"
77

88
PARALLEL="-j 5"

0 commit comments

Comments
 (0)