diff options
| author | Dan Halbert <halbert@adafruit.com> | 2020-03-10 09:48:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 09:48:46 -0400 |
| commit | 6363b5ad0667da00f24b542b301eae99984ebf0a (patch) | |
| tree | dc80ea2af03c811bcb09d181b23c4bda41f85ea1 | |
| parent | df88939128c01c9ae93ad8008e6b3bd2ff30c90b (diff) | |
| parent | 03a2b2faf15d0d2bda5eb092672676866a609fdd (diff) | |
Merge pull request #2693 from jepler/ulab-enable
ulab: enable on most builds
| -rw-r--r-- | ports/atmel-samd/mpconfigport.mk | 2 | ||||
| -rw-r--r-- | ports/cxd56/Makefile | 4 | ||||
| -rw-r--r-- | ports/cxd56/mpconfigport.mk | 2 | ||||
| -rw-r--r-- | ports/stm32f4/mpconfigport.mk | 2 | ||||
| -rw-r--r-- | py/circuitpy_mpconfig.mk | 5 |
5 files changed, 15 insertions, 0 deletions
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 7565e41a4..6b6b335d3 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -40,6 +40,8 @@ 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 + endif # samd21 # Put samd51-only choices here. diff --git a/ports/cxd56/Makefile b/ports/cxd56/Makefile index a0782c4e9..e2fce976d 100644 --- a/ports/cxd56/Makefile +++ b/ports/cxd56/Makefile @@ -176,6 +176,10 @@ OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED_MODULE_EXPANDED:.c=.o)) +ifeq ($(INTERNAL_LIBM),1) +OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o)) +endif +OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o)) # List of sources for qstr extraction SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) diff --git a/ports/cxd56/mpconfigport.mk b/ports/cxd56/mpconfigport.mk index a418ae8e9..ad3d0e72d 100644 --- a/ports/cxd56/mpconfigport.mk +++ b/ports/cxd56/mpconfigport.mk @@ -18,3 +18,5 @@ CIRCUITPY_NEOPIXEL_WRITE = 0 CIRCUITPY_NVM = 0 CIRCUITPY_DISPLAYIO = 0 CIRCUITPY_FREQUENCYIO = 0 + +INTERNAL_LIBM = 1 diff --git a/ports/stm32f4/mpconfigport.mk b/ports/stm32f4/mpconfigport.mk index f214282cb..493f32c63 100644 --- a/ports/stm32f4/mpconfigport.mk +++ b/ports/stm32f4/mpconfigport.mk @@ -71,5 +71,7 @@ endif CFLAGS += -DMICROPY_CPYTHON_COMPAT=1 +MICROPY_PY_ULAB = 1 + #ifeq ($(MCU_SUB_VARIANT), stm32f412zx) #endif diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index d6e033daf..21b1abd9b 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -339,6 +339,11 @@ CIRCUITPY_SERIAL_UART = 0 endif CFLAGS += -DCIRCUITPY_SERIAL_UART=$(CIRCUITPY_SERIAL_UART) +# ulab numerics library +ifndef MICROPY_PY_ULAB +MICROPY_PY_ULAB = $(CIRCUITPY_FULL_BUILD) +endif + # Enabled micropython.native decorator (experimental) ifndef CIRCUITPY_ENABLE_MPY_NATIVE CIRCUITPY_ENABLE_MPY_NATIVE = 0 |