Merge pull request #2418 from tannewt/remove_re_from_cpx_displayio

Remove `re` from CPX Displayio build to make space.

Author: tannewt

ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk

@@ -13,9 +13,10 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 # Turn off features and optimizations for Crickit build to make room for additional frozen libs.
 LONGINT_IMPL = NONE
 CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_PIXELBUF = 0
 CIRCUITPY_FREQUENCYIO = 0
+CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_PIXELBUF = 0
 
 SUPEROPT_GC = 0
 CFLAGS_INLINE_LIMIT = 55

ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h

@@ -43,3 +43,5 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+#define MICROPY_PY_URE 0

ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk

@@ -20,7 +20,7 @@ CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_RTC = 0
 
 SUPEROPT_GC = 0
-CFLAGS_INLINE_LIMIT = 35
+CFLAGS_INLINE_LIMIT = 55
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice

py/circuitpy_mpconfig.h

@@ -193,7 +193,9 @@ typedef long mp_off_t;
 #define MICROPY_PY_UERRNO                     (CIRCUITPY_FULL_BUILD)
 // Opposite setting is deliberate.
 #define MICROPY_PY_UERRNO_ERRORCODE           (!CIRCUITPY_FULL_BUILD)
+#ifndef MICROPY_PY_URE
 #define MICROPY_PY_URE                        (CIRCUITPY_FULL_BUILD)
+#endif
 #define MICROPY_PY_URE_MATCH_GROUPS           (CIRCUITPY_FULL_BUILD)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END   (CIRCUITPY_FULL_BUILD)
 #define MICROPY_PY_URE_SUB                    (CIRCUITPY_FULL_BUILD)