diff options
| author | Jeff Epler <jeff@adafruit.com> | 2020-10-21 20:12:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-21 20:12:20 -0500 |
| commit | fa4c4c2c10758a1af3d17a3853610ac9bbcc2a44 (patch) | |
| tree | 8dec8146369594ea3ded50f968abb2f6fdc3de0c | |
| parent | 50e90088a2cc260fdc203d54cebd448daa3c30c4 (diff) | |
| parent | 1921143838d1b245f4205184fb16b64409ddc153 (diff) | |
Merge pull request #3587 from adafruit/6.0.x
Merge in two fixes from 6.0.x
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 14b5db20c..fa576bbf0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -131,7 +131,7 @@ jobs: run: echo "$GITHUB_CONTEXT" - name: Install dependencies run: | - brew install gettext awscli + brew install gettext echo >>$GITHUB_PATH /usr/local/opt/gettext/bin - name: Versions run: | diff --git a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.h b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.h index cbca94e03..475752afb 100644 --- a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.h +++ b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.h @@ -9,7 +9,7 @@ // These are pins not to reset. // QSPI Data pins, PA23 is NeoPixel -#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11 | PA23) +#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11 | PORT_PA23) // QSPI CS, QSPI SCK #define MICROPY_PORT_B (PORT_PB10 | PORT_PB11) #define MICROPY_PORT_C (0) |