wip

Author: dhalbert

ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk

@@ -12,10 +12,13 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-FLASH_SDKCONFIG = esp-idf-config/sdkconfig-4MB-1ota.defaults
+
+# No OTA partition: larger filesystem instead for lots of images.
+FLASH_SIZE_SDKCONFIG = esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
 
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_CANIO = 0
+CIRCUITPY_DUALBANK = 0
 CIRCUITPY_ESPCAMERA = 1
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_KEYPAD = 0

…f/esp-idf-config/partitions-4MB-1ota.csv …esp-idf-config/partitions-4MB-no-ota.csvports/espressif/esp-idf-config/partitions-4MB-1ota.csv renamed to ports/espressif/esp-idf-config/partitions-4MB-no-ota.csv ports/espressif/esp-idf-config/partitions-4MB-1ota.csv renamed to ports/espressif/esp-idf-config/partitions-4MB-no-ota.csv

@@ -1,18 +1,25 @@
 #
+# Espressif IoT Development Framework Configuration
+#
+#
 # Serial flasher config
 #
 # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
-CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 # end of Serial flasher config
 
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-1ota.csv"
 #
 # Partition Table
 #
-CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-1ota.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-no-ota.csv"
+CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-ota.csv"
 # end of Partition Table
+
+# end of Espressif IoT Development Framework Configuration

…config/sdkconfig-flash-4MB-1ota.defaults …nfig/sdkconfig-flash-4MB-no-ota.defaultsports/espressif/esp-idf-config/sdkconfig-flash-4MB-1ota.defaults renamed to ports/espressif/esp-idf-config/sdkconfig-flash-4MB-no-ota.defaults ports/espressif/esp-idf-config/sdkconfig-flash-4MB-1ota.defaults renamed to ports/espressif/esp-idf-config/sdkconfig-flash-4MB-no-ota.defaults

@@ -26,7 +26,6 @@ CIRCUITPY_AUDIOMP3 ?= 0
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_CANIO ?= 1
 CIRCUITPY_COUNTIO ?= 1
-CIRCUITPY_DOTCLOCKFRAMEBUFFER_USES_SUPERVISOR_ALLOCATION = 0
 CIRCUITPY_DUALBANK ?= 1
 CIRCUITPY_ESPCAMERA ?= 1
 CIRCUITPY_ESPIDF ?= 1
@@ -113,14 +112,12 @@ else ifeq ($(IDF_TARGET),esp32s2)
 # Modules
 # No BLE in hw
 CIRCUITPY_BLEIO = 0
-CIRCUITPY_RGBMATRIX_USES_SUPERVISOR_ALLOCATION = 0
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0
 
 else ifeq ($(IDF_TARGET),esp32s3)
 # Modules
 CIRCUITPY_BITMAPFILTER ?= $(CIRCUITPY_ESPCAMERA)
-CIRCUITPY_RGBMATRIX_USES_SUPERVISOR_ALLOCATION = 0
 CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0
 
 # No room for _bleio on boards with 4MB flash

ports/espressif/mpconfigport.mk

@@ -415,9 +415,6 @@ extern const struct _mp_obj_module_t nvm_module;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-// From supervisor/memory.c
-struct _supervisor_allocation_node;
-
 void background_callback_run_all(void);
 #define RUN_BACKGROUND_TASKS (background_callback_run_all())
 

py/circuitpy_mpconfig.h

@@ -237,8 +237,6 @@ CFLAGS += -DCIRCUITPY_PARALLELDISPLAYBUS=$(CIRCUITPY_PARALLELDISPLAYBUS)
 
 CIRCUITPY_DOTCLOCKFRAMEBUFFER ?= 0
 CFLAGS += -DCIRCUITPY_DOTCLOCKFRAMEBUFFER=$(CIRCUITPY_DOTCLOCKFRAMEBUFFER)
-CIRCUITPY_DOTCLOCKFRAMEBUFFER_USES_SUPERVISOR_ALLOCATION ?= 1
-CFLAGS += -DCIRCUITPY_DOTCLOCKFRAMEBUFFER_USES_SUPERVISOR_ALLOCATION=$(CIRCUITPY_DOTCLOCKFRAMEBUFFER_USES_SUPERVISOR_ALLOCATION)
 
 # bitmaptools and framebufferio rely on displayio and are not on small boards
 CIRCUITPY_BITMAPTOOLS ?= $(call enable-if-all,$(CIRCUITPY_FULL_BUILD) $(CIRCUITPY_DISPLAYIO))
@@ -435,8 +433,6 @@ CFLAGS += -DCIRCUITPY_RP2PIO=$(CIRCUITPY_RP2PIO)
 
 CIRCUITPY_RGBMATRIX ?= 0
 CFLAGS += -DCIRCUITPY_RGBMATRIX=$(CIRCUITPY_RGBMATRIX)
-CIRCUITPY_RGBMATRIX_USES_SUPERVISOR_ALLOCATION ?= 1
-CFLAGS += -DCIRCUITPY_RGBMATRIX_USES_SUPERVISOR_ALLOCATION=$(CIRCUITPY_RGBMATRIX_USES_SUPERVISOR_ALLOCATION)
 
 CIRCUITPY_ROTARYIO ?= 1
 CFLAGS += -DCIRCUITPY_ROTARYIO=$(CIRCUITPY_ROTARYIO)