diff options
| author | Scott Shawcroft <scott@adafruit.com> | 2020-03-17 15:33:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 15:33:08 -0700 |
| commit | 4603c6ddd7aaccc5674db135fe3951e475ea05d8 (patch) | |
| tree | 238adb6865105638b47fa6a21b4be5d8afbf74df /ports/atmel-samd | |
| parent | 9453e10c57deee12f895466d872e3e9198c73f7d (diff) | |
| parent | 38a718ff5558c2286172091615aaeb2ded5f70f5 (diff) | |
Merge pull request #2711 from jepler/update-ulab5.1.0-rc.05.1.0
update ulab
Diffstat (limited to 'ports/atmel-samd')
| -rw-r--r-- | ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk | 2 | ||||
| -rw-r--r-- | ports/atmel-samd/mpconfigport.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk index eb3c81485..5429bcf86 100644 --- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk +++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk @@ -16,4 +16,4 @@ CIRCUITPY_NETWORK = 0 CIRCUITPY_PS2IO = 0 CIRCUITPY_AUDIOMP3 = 0 -MICROPY_PY_ULAB = 0 +CIRCUITPY_ULAB = 0 diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 6b6b335d3..c2408feae 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -40,7 +40,7 @@ endif # SAMD21 needs separate endpoint pairs for MSC BULK IN and BULK OUT, otherwise it's erratic. USB_MSC_EP_NUM_OUT = 1 -MICROPY_PY_ULAB = 0 +CIRCUITPY_ULAB = 0 endif # samd21 @@ -64,9 +64,9 @@ ifndef CIRCUITPY_SAMD CIRCUITPY_SAMD = 1 endif -ifndef MICROPY_PY_ULAB +ifndef CIRCUITPY_ULAB ifneq ($(CIRCUITPY_SMALL_BUILD),1) -MICROPY_PY_ULAB = 1 +CIRCUITPY_ULAB = 1 endif endif |