Skip to content

Commit 7f6da78

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#1344 from bwshockley/master
Add Mini SAM M4 board.
2 parents 1b4359e + 9aebe2f commit 7f6da78

6 files changed

Lines changed: 140 additions & 5 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ git:
2121
# that SDK is shortest and add it there. In the case of major re-organizations,
2222
# just try to make the builds "about equal in run time"
2323
env:
24-
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="feather_huzzah circuitplayground_express grandcentral_m4_express pca10056 pca10059 feather_nrf52832 feather_nrf52840_express makerdiary_nrf52840_mdk" TRAVIS_SDK=arm:nrf:esp8266
24+
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="feather_huzzah circuitplayground_express mini_sam_m4 grandcentral_m4_express pca10056 pca10059 feather_nrf52832 feather_nrf52840_express makerdiary_nrf52840_mdk" TRAVIS_SDK=arm:nrf:esp8266
2525
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0" TRAVIS_SDK=arm
2626
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow" TRAVIS_SDK=arm
2727
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300" TRAVIS_SDK=arm

‎ports/atmel-samd/boards/mini_sam_m4/board.c‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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+
#include "hal/include/hal_gpio.h"
30+
31+
void board_init(void) {
32+
}
33+
34+
bool board_requests_safe_mode(void) {
35+
return false;
36+
}
37+
38+
void reset_board(void) {
39+
}

‎ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.h‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#define MICROPY_HW_BOARD_NAME "Mini SAM M4"
2+
#define MICROPY_HW_MCU_NAME "samd51g19"
3+
4+
#define CIRCUITPY_MCU_FAMILY samd51
5+
6+
// RGB Status LED Pins
7+
#define MICROPY_HW_APA102_MOSI (&pin_PB03)
8+
#define MICROPY_HW_APA102_SCK (&pin_PB02)
9+
10+
#define CIRCUITPY_BITBANG_APA102
11+
12+
// These are pins not to reset.
13+
// QSPI Data pins
14+
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11)
15+
// RGB Status LED pins, QSPI CS, and QSPI SCK
16+
#define MICROPY_PORT_B (PORT_PB02 | PORT_PB03 | PORT_PB10 | PORT_PB11)
17+
#define MICROPY_PORT_C (0)
18+
#define MICROPY_PORT_D (0)
19+
20+
#define AUTORESET_DELAY_MS 500
21+
22+
// If you change this, then make sure to update the linker scripts as well to
23+
// make sure you don't overwrite code
24+
#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
25+
26+
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
27+
28+
#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
29+
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
30+
31+
#define DEFAULT_SPI_BUS_SCK (&pin_PA01)
32+
#define DEFAULT_SPI_BUS_MOSI (&pin_PB22)
33+
#define DEFAULT_SPI_BUS_MISO (&pin_PB23)
34+
35+
#define DEFAULT_UART_BUS_RX (&pin_PA16)
36+
#define DEFAULT_UART_BUS_TX (&pin_PA17)
37+
38+
// USB is always used internally so skip the pin objects for it.
39+
#define IGNORE_PIN_PA24 1
40+
#define IGNORE_PIN_PA25 1

‎ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
LD_FILE = boards/samd51x19-bootloader-external-flash.ld
2+
USB_VID = 0x1209
3+
USB_PID = 0x2017
4+
USB_PRODUCT = "Mini SAM M4"
5+
USB_MANUFACTURER = "Benjamin Shockley"
6+
7+
QSPI_FLASH_FILESYSTEM = 1
8+
EXTERNAL_FLASH_DEVICE_COUNT = 1
9+
EXTERNAL_FLASH_DEVICES = "W25Q16JV_IM"
10+
LONGINT_IMPL = MPZ
11+
12+
CHIP_VARIANT = SAMD51G19A
13+
CHIP_FAMILY = samd51

‎ports/atmel-samd/boards/mini_sam_m4/pins.c‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
#include "board_busses.h"
4+
5+
// This mapping only includes functional names because pins broken
6+
// out on connectors are labeled with their MCU name available from
7+
// microcontroller.pin.
8+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
9+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
10+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) },
11+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB09) },
12+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) },
13+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA05) },
14+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA06) },
15+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PA07) },
16+
{ MP_OBJ_NEW_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_PA03) },
17+
18+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA16) },
19+
{ MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA16) },
20+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA17) },
21+
{ MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA17) },
22+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA07) },
23+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA19) },
24+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA20) },
25+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA21) },
26+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA00) },
27+
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_PA00) },
28+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA15) },
29+
{ MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA15) },
30+
31+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12) },
32+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13) },
33+
34+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA01) },
35+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB22) },
36+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB23) },
37+
38+
{ MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_PB03) },
39+
{ MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_PB02) },
40+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
41+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
42+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
43+
};
44+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎supervisor/shared/external_flash/devices.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,10 @@ typedef struct {
220220
.memory_type = 0x70, \
221221
.capacity = 0x15, \
222222
.max_clock_speed_mhz = 133, \
223+
.quad_enable_bit_mask = 0x02, \
223224
.has_sector_protection = false, \
224225
.supports_fast_read = true, \
225226
.supports_qspi = true, \
226-
.has_quad_enable = true, \
227227
.supports_qspi_writes = true, \
228228
.write_status_register_split = false, \
229229
}
@@ -254,10 +254,10 @@ typedef struct {
254254
.memory_type = 0x70, \
255255
.capacity = 0x16, \
256256
.max_clock_speed_mhz = 133, \
257+
.quad_enable_bit_mask = 0x02, \
257258
.has_sector_protection = false, \
258259
.supports_fast_read = true, \
259260
.supports_qspi = true, \
260-
.has_quad_enable = true, \
261261
.supports_qspi_writes = true, \
262262
.write_status_register_split = false, \
263263
}
@@ -275,7 +275,6 @@ typedef struct {
275275
.has_sector_protection = false, \
276276
.supports_fast_read = true, \
277277
.supports_qspi = true, \
278-
.has_quad_enable = true, \
279278
.supports_qspi_writes = true, \
280279
.write_status_register_split = false, \
281280
.single_status_byte = false, \
@@ -364,10 +363,10 @@ typedef struct {
364363
.memory_type = 0x70, \
365364
.capacity = 0x18, \
366365
.max_clock_speed_mhz = 133, \
366+
.quad_enable_bit_mask = 0x02, \
367367
.has_sector_protection = false, \
368368
.supports_fast_read = true, \
369369
.supports_qspi = true, \
370-
.has_quad_enable = true, \
371370
.supports_qspi_writes = true, \
372371
.write_status_register_split = false, \
373372
}

0 commit comments

Comments
 (0)