ulab: rename enable macro so it appears in the support matrix

11 files changed, 16 insertions, 16 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
 
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index db1b6b03e..fcc59c484 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -69,5 +69,5 @@ NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
 # Defined here because system_nrf52840.c doesn't #include any of our own include files.
 CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS
 
-MICROPY_PY_ULAB = 1
+CIRCUITPY_ULAB = 1
 endif
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index 493f32c63..529a94248 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -71,7 +71,7 @@ endif
 
 CFLAGS += -DMICROPY_CPYTHON_COMPAT=1
 
-MICROPY_PY_ULAB = 1
+CIRCUITPY_ULAB = 1
 
 #ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
 #endif
diff --git a/ports/unix/mpconfigport.mk b/ports/unix/mpconfigport.mk
index 4cb1804d4..6bb1c9693 100644
--- a/ports/unix/mpconfigport.mk
+++ b/ports/unix/mpconfigport.mk
@@ -41,4 +41,4 @@ MICROPY_PY_JNI = 0
 # as submodules (currently affects only libffi).
 MICROPY_STANDALONE = 0
 
-MICROPY_PY_ULAB = 1
+CIRCUITPY_ULAB = 1
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 92021d0d0..f84d0b5b1 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -431,7 +431,7 @@ $(addprefix lib/,\
 	libm/atanf.c \
 	libm/atan2f.c \
 	)
-ifeq ($(MICROPY_PY_ULAB),1)
+ifeq ($(CIRCUITPY_ULAB),1)
 SRC_LIBM += \
 $(addprefix lib/,\
 	libm/acoshf.c \
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index acff27bcf..04e191264 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -581,7 +581,7 @@ extern const struct _mp_obj_module_t ustack_module;
 #define JSON_MODULE
 #endif
 
-#if defined(MICROPY_PY_ULAB) && MICROPY_PY_ULAB
+#if defined(CIRCUITPY_ULAB) && CIRCUITPY_ULAB
 #define ULAB_MODULE \
     { MP_ROM_QSTR(MP_QSTR_ulab), MP_ROM_PTR(&ulab_user_cmodule) },
 #else
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 21b1abd9b..1a375efc6 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -340,8 +340,8 @@ endif
 CFLAGS += -DCIRCUITPY_SERIAL_UART=$(CIRCUITPY_SERIAL_UART)
 
 # ulab numerics library
-ifndef MICROPY_PY_ULAB
-MICROPY_PY_ULAB = $(CIRCUITPY_FULL_BUILD)
+ifndef CIRCUITPY_ULAB
+CIRCUITPY_ULAB = $(CIRCUITPY_FULL_BUILD)
 endif
 
 # Enabled micropython.native decorator (experimental)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 01572f546..513f04f6e 100755
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1178,8 +1178,8 @@ typedef double mp_float_t;
 #define MICROPY_PY_UJSON (0)
 #endif
 
-#ifndef MICROPY_PY_ULAB
-#define MICROPY_PY_ULAB (0)
+#ifndef CIRCUITPY_ULAB
+#define CIRCUITPY_ULAB (0)
 #endif
 
 #ifndef MICROPY_PY_URE
diff --git a/py/objmodule.c b/py/objmodule.c
index 7405a6919..b6a8a084e 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -213,7 +213,7 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) },
 #endif
 #endif
-#if MICROPY_PY_ULAB
+#if CIRCUITPY_ULAB
 #if CIRCUITPY
 // CircuitPython: Defined in MICROPY_PORT_BUILTIN_MODULES, so not defined here.
 // TODO: move to shared-bindings/
diff --git a/py/py.mk b/py/py.mk
index 5e044947a..d70c6c33e 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -105,7 +105,7 @@ $(BUILD)/$(BTREE_DIR)/%.o: CFLAGS += -Wno-old-style-definition -Wno-sign-compare
 $(BUILD)/extmod/modbtree.o: CFLAGS += $(BTREE_DEFS)
 endif
 
-ifeq ($(MICROPY_PY_ULAB),1)
+ifeq ($(CIRCUITPY_ULAB),1)
 SRC_MOD += $(addprefix extmod/ulab/code/, \
 create.c \
 fft.c \
@@ -117,7 +117,7 @@ poly.c \
 ulab.c \
 vectorise.c \
 	)
-CFLAGS_MOD += -DMICROPY_PY_ULAB=1 -DMODULE_ULAB_ENABLED=1
+CFLAGS_MOD += -DCIRCUITPY_ULAB=1 -DMODULE_ULAB_ENABLED=1
 $(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Wno-sign-compare -Wno-missing-prototypes -Wno-unused-parameter -Wno-missing-declarations -Wno-error -Wno-shadow -Wno-maybe-uninitialized -DCIRCUITPY
 endif