Merge pull request #631 from tannewt/metro_revb

Add a new board for Metro M4 Express Rev B.

6 files changed, 170 insertions, 34 deletions

diff --git a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h
index b8f14e625..18d65df2b 100644
--- a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h
+++ b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h
@@ -3,40 +3,20 @@
 
 #define CIRCUITPY_MCU_FAMILY samd51
 
+// This is for Rev D which is light blue
+
 #define MICROPY_HW_LED_TX   PIN_PA27
 #define MICROPY_HW_LED_RX   PIN_PB06
 
 #define MICROPY_HW_NEOPIXEL (&pin_PB17)
 
-#define SPI_FLASH_BAUDRATE  (8000000)
-
-// Rev B: single channel SPI
-// Rev C will be QSPI
-#define SPI_FLASH_MOSI_PIN          PIN_PB08
-#define SPI_FLASH_MISO_PIN          PIN_PB11
-#define SPI_FLASH_SCK_PIN           PIN_PB09
-#define SPI_FLASH_CS_PIN            PIN_PB10
-#define SPI_FLASH_MOSI_PIN_FUNCTION PINMUX_PB08D_SERCOM4_PAD0
-#define SPI_FLASH_MISO_PIN_FUNCTION PINMUX_PB11D_SERCOM4_PAD3
-#define SPI_FLASH_SCK_PIN_FUNCTION  PINMUX_PB09D_SERCOM4_PAD1
-#define SPI_FLASH_SERCOM            SERCOM4
-#define SPI_FLASH_SERCOM_INDEX      4
-#define SPI_FLASH_MOSI_PAD          0
-#define SPI_FLASH_MISO_PAD          3
-#define SPI_FLASH_SCK_PAD           1
-// <o> Transmit Data Pinout
-// <0x0=>PAD[0,1]_DO_SCK
-// <0x1=>PAD[2,3]_DO_SCK
-// <0x2=>PAD[3,1]_DO_SCK
-// <0x3=>PAD[0,3]_DO_SCK
-#define SPI_FLASH_DOPO              0
-#define SPI_FLASH_DIPO              3   // same as MISO pad
-
 // These are pins not to reset.
-#define MICROPY_PORT_A        (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11 | PORT_PA27)
-#define MICROPY_PORT_B        (PORT_PB10 | PORT_PB11 | PORT_PB17)
-#define MICROPY_PORT_C        (0)
-#define MICROPY_PORT_D        (0)
+// QSPI Data pins and TX LED
+#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11 | PORT_PA27)
+// RX LED, QSPI CS, QSPI SCK and NeoPixel pin
+#define MICROPY_PORT_B ( PORT_PB06 | PORT_PB10 | PORT_PB11 | PORT_PB17)
+#define MICROPY_PORT_C (0)
+#define MICROPY_PORT_D (0)
 
 #define AUTORESET_DELAY_MS 500
 
@@ -49,5 +29,5 @@
 
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
 
-#include "external_flash/devices/S25FL216K.h"
+#include "external_flash/devices/S25FL116K.h"
 #include "external_flash/devices/GD25Q16C.h"
diff --git a/ports/atmel-samd/boards/metro_m4_express/pins.c b/ports/atmel-samd/boards/metro_m4_express/pins.c
index f6ad05f2d..5889c6c68 100644
--- a/ports/atmel-samd/boards/metro_m4_express/pins.c
+++ b/ports/atmel-samd/boards/metro_m4_express/pins.c
@@ -7,16 +7,16 @@ STATIC const mp_map_elem_t board_global_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_A0),  (mp_obj_t)&pin_PA02 },
     { MP_OBJ_NEW_QSTR(MP_QSTR_A1),  (mp_obj_t)&pin_PA05 },
     { MP_OBJ_NEW_QSTR(MP_QSTR_A2),  (mp_obj_t)&pin_PA06 },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A3),  (mp_obj_t)&pin_PA04 },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_A4),  (mp_obj_t)&pin_PA11 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A3),  (mp_obj_t)&pin_PB09 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A4),  (mp_obj_t)&pin_PB08 },
     { MP_OBJ_NEW_QSTR(MP_QSTR_A5),  (mp_obj_t)&pin_PA07 },
 
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_D0),  (mp_obj_t)&pin_PA23 },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D1),  (mp_obj_t)&pin_PA22 },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D2),  (mp_obj_t)&pin_PA08 },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D3),  (mp_obj_t)&pin_PA10 },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D4),  (mp_obj_t)&pin_PB12 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D2),  (mp_obj_t)&pin_PA04 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D3),  (mp_obj_t)&pin_PB16 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D4),  (mp_obj_t)&pin_PB13 },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D5),  (mp_obj_t)&pin_PB14 },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D6),  (mp_obj_t)&pin_PB15 },
     { MP_OBJ_NEW_QSTR(MP_QSTR_D7),  (mp_obj_t)&pin_PA14 },
diff --git a/ports/atmel-samd/boards/metro_m4_express_revb/board.c b/ports/atmel-samd/boards/metro_m4_express_revb/board.c
new file mode 100644
index 000000000..a98385d29
--- /dev/null
+++ b/ports/atmel-samd/boards/metro_m4_express_revb/board.c
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "boards/board.h"
+#include "mpconfigboard.h"
+#include "hal/include/hal_gpio.h"
+
+void board_init(void) {
+    gpio_set_pin_function(MICROPY_HW_LED_TX, GPIO_PIN_FUNCTION_OFF);
+    gpio_set_pin_direction(MICROPY_HW_LED_TX, GPIO_DIRECTION_OUT);
+    gpio_set_pin_level(MICROPY_HW_LED_TX, true);
+
+    gpio_set_pin_function(MICROPY_HW_LED_RX, GPIO_PIN_FUNCTION_OFF);
+    gpio_set_pin_direction(MICROPY_HW_LED_RX, GPIO_DIRECTION_OUT);
+    gpio_set_pin_level(MICROPY_HW_LED_RX, true);
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
diff --git a/ports/atmel-samd/boards/metro_m4_express_revb/mpconfigboard.h b/ports/atmel-samd/boards/metro_m4_express_revb/mpconfigboard.h
new file mode 100644
index 000000000..7c51bae87
--- /dev/null
+++ b/ports/atmel-samd/boards/metro_m4_express_revb/mpconfigboard.h
@@ -0,0 +1,58 @@
+// This is for Rev B which a larger run was done and sent to Adafruit community
+// members.
+
+#define MICROPY_HW_BOARD_NAME "Metro M4 Express Rev B (Black)"
+#define MICROPY_HW_MCU_NAME "samd51j19"
+
+#define CIRCUITPY_MCU_FAMILY samd51
+
+#define MICROPY_HW_LED_TX   PIN_PA27
+#define MICROPY_HW_LED_RX   PIN_PB06
+
+#define MICROPY_HW_NEOPIXEL (&pin_PB17)
+
+#define SPI_FLASH_BAUDRATE  (8000000)
+
+// Rev B: single channel SPI
+// Rev C will be QSPI
+#define SPI_FLASH_MOSI_PIN          PIN_PB08
+#define SPI_FLASH_MISO_PIN          PIN_PB11
+#define SPI_FLASH_SCK_PIN           PIN_PB09
+#define SPI_FLASH_CS_PIN            PIN_PB10
+#define SPI_FLASH_MOSI_PIN_FUNCTION PINMUX_PB08D_SERCOM4_PAD0
+#define SPI_FLASH_MISO_PIN_FUNCTION PINMUX_PB11D_SERCOM4_PAD3
+#define SPI_FLASH_SCK_PIN_FUNCTION  PINMUX_PB09D_SERCOM4_PAD1
+#define SPI_FLASH_SERCOM            SERCOM4
+#define SPI_FLASH_SERCOM_INDEX      4
+#define SPI_FLASH_MOSI_PAD          0
+#define SPI_FLASH_MISO_PAD          3
+#define SPI_FLASH_SCK_PAD           1
+// <o> Transmit Data Pinout
+// <0x0=>PAD[0,1]_DO_SCK
+// <0x1=>PAD[2,3]_DO_SCK
+// <0x2=>PAD[3,1]_DO_SCK
+// <0x3=>PAD[0,3]_DO_SCK
+#define SPI_FLASH_DOPO              0
+#define SPI_FLASH_DIPO              3   // same as MISO pad
+
+// These are pins not to reset.
+// Pin for TX LED
+#define MICROPY_PORT_A (PORT_PA27)
+// Pins for RX LED, SPI flash and neopixel
+#define MICROPY_PORT_B (PORT_PB06 | PORT_PB08 | PORT_PB09 | PORT_PB10 | PORT_PB11 | PORT_PB17)
+#define MICROPY_PORT_C (0)
+#define MICROPY_PORT_D (0)
+
+#define AUTORESET_DELAY_MS 500
+
+#include "external_flash/external_flash.h"
+
+// If you change this, then make sure to update the linker scripts as well to
+// make sure you don't overwrite code
+// #define CIRCUITPY_INTERNAL_NVM_SIZE 256
+#define CIRCUITPY_INTERNAL_NVM_SIZE 0
+
+#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
+
+#include "external_flash/devices/S25FL216K.h"
+#include "external_flash/devices/GD25Q16C.h"
diff --git a/ports/atmel-samd/boards/metro_m4_express_revb/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_express_revb/mpconfigboard.mk
new file mode 100644
index 000000000..a3d6e2522
--- /dev/null
+++ b/ports/atmel-samd/boards/metro_m4_express_revb/mpconfigboard.mk
@@ -0,0 +1,10 @@
+LD_FILE = boards/samd51x19-bootloader-external-flash.ld
+USB_VID = 0x239A
+USB_PID = 0x8021
+USB_PRODUCT = "Metro M4 Express Rev B (Black)"
+USB_MANUFACTURER = "Adafruit Industries LLC"
+
+SPI_FLASH_FILESYSTEM = 1
+
+CHIP_VARIANT = SAMD51J19A
+CHIP_FAMILY = samd51
diff --git a/ports/atmel-samd/boards/metro_m4_express_revb/pins.c b/ports/atmel-samd/boards/metro_m4_express_revb/pins.c
new file mode 100644
index 000000000..f6ad05f2d
--- /dev/null
+++ b/ports/atmel-samd/boards/metro_m4_express_revb/pins.c
@@ -0,0 +1,42 @@
+#include "samd51_pins.h"
+
+// This mapping only includes functional names because pins broken
+// out on connectors are labeled with their MCU name available from
+// microcontroller.pin.
+STATIC const mp_map_elem_t board_global_dict_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A0),  (mp_obj_t)&pin_PA02 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A1),  (mp_obj_t)&pin_PA05 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A2),  (mp_obj_t)&pin_PA06 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A3),  (mp_obj_t)&pin_PA04 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A4),  (mp_obj_t)&pin_PA11 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A5),  (mp_obj_t)&pin_PA07 },
+
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D0),  (mp_obj_t)&pin_PA23 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D1),  (mp_obj_t)&pin_PA22 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D2),  (mp_obj_t)&pin_PA08 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D3),  (mp_obj_t)&pin_PA10 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D4),  (mp_obj_t)&pin_PB12 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D5),  (mp_obj_t)&pin_PB14 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D6),  (mp_obj_t)&pin_PB15 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D7),  (mp_obj_t)&pin_PA14 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D8),  (mp_obj_t)&pin_PA16 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D9),  (mp_obj_t)&pin_PA17 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D10),  (mp_obj_t)&pin_PA18 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D11),  (mp_obj_t)&pin_PA19 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D12),  (mp_obj_t)&pin_PA20 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D13), (mp_obj_t)&pin_PA21 },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), (mp_obj_t)&pin_PB02 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SCL), (mp_obj_t)&pin_PB03 },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), (mp_obj_t)&pin_PB17 },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SCK), (mp_obj_t)&pin_PA13 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), (mp_obj_t)&pin_PA12 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_MISO), (mp_obj_t)&pin_PA15 },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_LED_RX), (mp_obj_t)&pin_PB06 },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_LED_TX), (mp_obj_t)&pin_PA27 },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);