Re-enable ulab at the expense of some other modules

.. and gate audiomixer based on audiocore (should be no net change) .. and get rid of now-redundant enables in the espressif mpconfigport
ladyada · Jul 25, 2023 · fd60ccc · fd60ccc
1 parent 45b6c84
commit fd60ccc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk b/ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk
@@ -9,5 +9,12 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_CANIO = 0
 CIRCUITPY_ESPCAMERA = 1
-CIRCUITPY_ULAB = 0
+CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_KEYPAD = 0
+CIRCUITPY_ONEWIREIO = 0
+CIRCUITPY_PARALLELDISPLAY = 0
+CIRCUITPY_RGBMATRIX = 0
+CIRCUITPY_ROTARYIO = 0
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
@@ -16,9 +16,7 @@ CIRCUITPY_ANALOGBUFIO ?= 1
 CIRCUITPY_AUDIOBUSIO ?= 1
 CIRCUITPY_AUDIOBUSIO_I2SOUT ?= 1
 CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
-CIRCUITPY_AUDIOCORE ?= 1
 CIRCUITPY_AUDIOIO ?= 0
-CIRCUITPY_AUDIOMIXER ?= 1
 CIRCUITPY_AUDIOMP3 ?= 0
 CIRCUITPY_BLEIO ?= 1
 CIRCUITPY_BLEIO_HCI = 0

diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
@@ -104,7 +104,7 @@ endif
 endif
 CFLAGS += -DCIRCUITPY_AUDIOCORE=$(CIRCUITPY_AUDIOCORE)
 
-CIRCUITPY_AUDIOMIXER ?= $(CIRCUITPY_AUDIOIO)
+CIRCUITPY_AUDIOMIXER ?= $(CIRCUITPY_AUDIOCORE)
 CFLAGS += -DCIRCUITPY_AUDIOMIXER=$(CIRCUITPY_AUDIOMIXER)
 
 ifndef CIRCUITPY_AUDIOCORE_DEBUG