Skip to content

Commit d6342af

Browse files
committed
ulab: rename enable macro so it appears in the support matrix
1 parent aa54a7e commit d6342af

File tree

11 files changed

+16
-16
lines changed

11 files changed

+16
-16
lines changed

ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ CIRCUITPY_NETWORK = 0
1616
CIRCUITPY_PS2IO = 0
1717
CIRCUITPY_AUDIOMP3 = 0
1818

19-
MICROPY_PY_ULAB = 0
19+
CIRCUITPY_ULAB = 0

ports/atmel-samd/mpconfigport.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ endif
4040
# SAMD21 needs separate endpoint pairs for MSC BULK IN and BULK OUT, otherwise it's erratic.
4141
USB_MSC_EP_NUM_OUT = 1
4242

43-
MICROPY_PY_ULAB = 0
43+
CIRCUITPY_ULAB = 0
4444

4545
endif # samd21
4646

@@ -64,9 +64,9 @@ ifndef CIRCUITPY_SAMD
6464
CIRCUITPY_SAMD = 1
6565
endif
6666

67-
ifndef MICROPY_PY_ULAB
67+
ifndef CIRCUITPY_ULAB
6868
ifneq ($(CIRCUITPY_SMALL_BUILD),1)
69-
MICROPY_PY_ULAB = 1
69+
CIRCUITPY_ULAB = 1
7070
endif
7171
endif
7272

ports/nrf/mpconfigport.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,5 @@ NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
6969
# Defined here because system_nrf52840.c doesn't #include any of our own include files.
7070
CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS
7171

72-
MICROPY_PY_ULAB = 1
72+
CIRCUITPY_ULAB = 1
7373
endif

ports/stm/mpconfigport.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ endif
7171

7272
CFLAGS += -DMICROPY_CPYTHON_COMPAT=1
7373

74-
MICROPY_PY_ULAB = 1
74+
CIRCUITPY_ULAB = 1
7575

7676
#ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
7777
#endif

ports/unix/mpconfigport.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ MICROPY_PY_JNI = 0
4141
# as submodules (currently affects only libffi).
4242
MICROPY_STANDALONE = 0
4343

44-
MICROPY_PY_ULAB = 1
44+
CIRCUITPY_ULAB = 1

py/circuitpy_defns.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ $(addprefix lib/,\
431431
libm/atanf.c \
432432
libm/atan2f.c \
433433
)
434-
ifeq ($(MICROPY_PY_ULAB),1)
434+
ifeq ($(CIRCUITPY_ULAB),1)
435435
SRC_LIBM += \
436436
$(addprefix lib/,\
437437
libm/acoshf.c \

py/circuitpy_mpconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ extern const struct _mp_obj_module_t ustack_module;
581581
#define JSON_MODULE
582582
#endif
583583

584-
#if defined(MICROPY_PY_ULAB) && MICROPY_PY_ULAB
584+
#if defined(CIRCUITPY_ULAB) && CIRCUITPY_ULAB
585585
#define ULAB_MODULE \
586586
{ MP_ROM_QSTR(MP_QSTR_ulab), MP_ROM_PTR(&ulab_user_cmodule) },
587587
#else

py/circuitpy_mpconfig.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,8 @@ endif
340340
CFLAGS += -DCIRCUITPY_SERIAL_UART=$(CIRCUITPY_SERIAL_UART)
341341

342342
# ulab numerics library
343-
ifndef MICROPY_PY_ULAB
344-
MICROPY_PY_ULAB = $(CIRCUITPY_FULL_BUILD)
343+
ifndef CIRCUITPY_ULAB
344+
CIRCUITPY_ULAB = $(CIRCUITPY_FULL_BUILD)
345345
endif
346346

347347
# Enabled micropython.native decorator (experimental)

py/mpconfig.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,8 +1178,8 @@ typedef double mp_float_t;
11781178
#define MICROPY_PY_UJSON (0)
11791179
#endif
11801180

1181-
#ifndef MICROPY_PY_ULAB
1182-
#define MICROPY_PY_ULAB (0)
1181+
#ifndef CIRCUITPY_ULAB
1182+
#define CIRCUITPY_ULAB (0)
11831183
#endif
11841184

11851185
#ifndef MICROPY_PY_URE

py/objmodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
213213
{ MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) },
214214
#endif
215215
#endif
216-
#if MICROPY_PY_ULAB
216+
#if CIRCUITPY_ULAB
217217
#if CIRCUITPY
218218
// CircuitPython: Defined in MICROPY_PORT_BUILTIN_MODULES, so not defined here.
219219
// TODO: move to shared-bindings/

0 commit comments

Comments
 (0)