diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-06-26 19:49:55 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2018-06-26 19:49:55 -0400 |
| commit | 1f3de5174e236a4d6431e336163b30a47f44dffb (patch) | |
| tree | 31caed76bf2fa1d74546854866c40751e2362486 | |
| parent | de4cd1ee739ec93acc7a61252462e8a2f117a259 (diff) | |
Freeze Adafruit_CircuitPython_Crickit into crickit builds
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | frozen/Adafruit_CircuitPython_Crickit | 0 | ||||
| m--------- | frozen/Adafruit_CircuitPython_seesaw | 0 | ||||
| -rw-r--r-- | ports/atmel-samd/Makefile | 3 | ||||
| -rw-r--r-- | ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk | 3 | ||||
| -rw-r--r-- | ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk | 3 |
6 files changed, 12 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 61f5b5572..8c834ba53 100644 --- a/.gitmodules +++ b/.gitmodules @@ -70,3 +70,6 @@ [submodule "ports/atmel-samd/peripherals"] path = ports/atmel-samd/peripherals url = https://github.com/adafruit/samd-peripherals.git +[submodule "frozen/Adafruit_CircuitPython_Crickit"] + path = frozen/Adafruit_CircuitPython_Crickit + url = https://github.com/adafruit/Adafruit_CircuitPython_Crickit diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit new file mode 160000 +Subproject 69669f85339f23e7c32ea07cfb2ee00b06c37e7 diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw -Subproject 498f59bf926477b3a8fb8eb157ca05eb12c3e29 +Subproject bf808037b3fb918353f514ef847d47a2d53a954 diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile index b7181aa3b..62f058c3d 100644 --- a/ports/atmel-samd/Makefile +++ b/ports/atmel-samd/Makefile @@ -117,6 +117,9 @@ else ifdef INTERNAL_FLASH_FILESYSTEM CFLAGS += -finline-limit=55 endif + ifdef CFLAGS_INLINE_LIMIT + CFLAGS += -finline-limit=$(CFLAGS_INLINE_LIMIT) + endif CFLAGS += -flto endif diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk index 0145bf785..a1c40424f 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk @@ -11,9 +11,12 @@ LONGINT_IMPL = NONE CHIP_VARIANT = SAMD21G18A CHIP_FAMILY = samd21 +CFLAGS_INLINE_LIMIT = 65 + # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk index 4096560c2..bc9ec89ac 100644 --- a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk @@ -10,8 +10,11 @@ LONGINT_IMPL = MPZ CHIP_VARIANT = SAMD21G18A CHIP_FAMILY = samd21 +CFLAGS_INLINE_LIMIT = 65 + # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_seesaw |