Merge pull request #10424 from dhalbert/expand-non-usb-partitions

eightycc · web-flow · commit a634a4773dcc · 2025-06-15T19:58:32.000-07:00
Expand Espressif non-usb firmware partitions
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
@@ -572,11 +572,14 @@ ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
 else
 UF2_BOOTLOADER ?= $(CIRCUITPY_USB_DEVICE)
 ifeq ($(UF2_BOOTLOADER), 1)
+# UF2-capable board
 	FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
 else
+# non-UF2 partition layout
 ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 4MB)
-	ifeq ($(CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT), 1)
-		FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-uf2.defaults
+	ifeq ($(CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT), 1)
+# Some boards use a 2MB firmware and almost 2MB user filesystem, for historical reasons.
+		FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2-large-user_fs.defaults
 	else
 		FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
 	endif
diff --git a/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk b/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
diff --git a/ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/mpconfigboard.mk
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c6
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
+CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
@@ -18,5 +18,4 @@ OPTIMIZATION_FLAGS = -Os
 #CIRCUITPY_PARALLELDISPLAYBUS = 0
 CIRCUITPY_BLEIO_NATIVE = 1
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 0
 FLASH_SIZE_SDKCONFIG = esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
diff --git a/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk b/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk
@@ -7,13 +7,8 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
 
-# Not enough flash space.
-CIRCUITPY_CODEOP = 0
-
 # Not enough pins.
 CIRCUITPY_PARALLELDISPLAYBUS = 0
 CIRCUITPY_RGBMATRIX = 0
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
@@ -7,7 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
-CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
@@ -8,7 +8,4 @@ CIRCUITPY_ESP_FLASH_MODE=qio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
-CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/espressif/boards/cezerio_dev_ESP32C6/mpconfigboard.mk b/ports/espressif/boards/cezerio_dev_ESP32C6/mpconfigboard.mk
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c6
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
+CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1
diff --git a/ports/espressif/boards/deneyap_kart/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
diff --git a/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
diff --git a/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk
@@ -14,8 +14,6 @@ CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_BITMAPFILTER = 0
 CIRCUITPY_CODEOP = 0
diff --git a/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
diff --git a/ports/espressif/boards/deneyap_mini/mpconfigboard.mk b/ports/espressif/boards/deneyap_mini/mpconfigboard.mk
@@ -10,6 +10,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/deneyap_mini_v2/mpconfigboard.mk b/ports/espressif/boards/deneyap_mini_v2/mpconfigboard.mk
@@ -13,5 +13,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
diff --git a/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk b/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk
@@ -6,6 +6,5 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESPCAMERA = 0
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32_devkitc_v4_wroom_32e/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32_devkitc_v4_wroom_32e/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
@@ -13,8 +13,6 @@ CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 40m
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_CANIO = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_PIXELBUF = 0
diff --git a/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.mk
@@ -11,6 +11,4 @@ CIRCUITPY_ESP_PSRAM_SIZE = 4MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 40m
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
diff --git a/ports/espressif/boards/espressif_esp32c6_devkitm_1_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32c6_devkitm_1_n4/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_AUDIOMP3 = 0
diff --git a/ports/espressif/boards/espressif_esp32h2_devkitm_1_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32h2_devkitm_1_n4/mpconfigboard.mk
@@ -6,3 +6,6 @@ IDF_TARGET = esp32h2
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 48m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
+CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1
diff --git a/ports/espressif/boards/espressif_esp8684_devkitc_02_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp8684_devkitc_02_n4/mpconfigboard.mk
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c2
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 60m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
+CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1
diff --git a/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.mk
@@ -8,3 +8,6 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
+
+# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
+CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1
diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_4m/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_4m/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -7,10 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=qio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
-# Not enough flash
-CIRCUITPY_SOCKETPOOL_IPV6 = 0
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
-CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/espressif/boards/lolin_c3_pico/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_pico/mpconfigboard.mk
@@ -7,12 +7,7 @@ CIRCUITPY_ESP_FLASH_MODE=qio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
 
-# Not enough flash
-CIRCUITPY_SOCKETPOOL_IPV6 = 0
-
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/lolin_c3_pico/sdkconfig b/ports/espressif/boards/lolin_c3_pico/sdkconfig
@@ -7,7 +7,6 @@
 #
 # LWIP
 #
-# CONFIG_LWIP_IPV6 is not set
 # end of LWIP
 
 # end of Component config
diff --git a/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
diff --git a/ports/espressif/boards/luatos_core_esp32c3_ch343/mpconfigboard.mk b/ports/espressif/boards/luatos_core_esp32c3_ch343/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
diff --git a/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk b/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=qio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
diff --git a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
@@ -6,8 +6,7 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESPCAMERA = 0
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
+CIRCUITPY_ESPCAMERA = 0
 
 SRC_C += pmic/axp192/axp192.c
diff --git a/ports/espressif/boards/m5stack_stick_c_plus/mpconfigboard.mk b/ports/espressif/boards/m5stack_stick_c_plus/mpconfigboard.mk
@@ -6,8 +6,7 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESPCAMERA = 0
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
+CIRCUITPY_ESPCAMERA = 0
 
 SRC_C += pmic/axp192/axp192.c
diff --git a/ports/espressif/boards/m5stack_timer_camera_x/mpconfigboard.mk b/ports/espressif/boards/m5stack_timer_camera_x/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
diff --git a/ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.mk b/ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.mk
@@ -7,8 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-CIRCUITPY_CODEOP = 0
-
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
diff --git a/ports/espressif/boards/makergo_esp32c6_supermini/mpconfigboard.mk b/ports/espressif/boards/makergo_esp32c6_supermini/mpconfigboard.mk
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c6
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
+CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1
diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
@@ -7,7 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
-CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/espressif/boards/nodemcu_esp32c2/mpconfigboard.mk b/ports/espressif/boards/nodemcu_esp32c2/mpconfigboard.mk
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c2
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 60m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
+CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1
diff --git a/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk b/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
diff --git a/ports/espressif/boards/seeed_xiao_esp32c6/mpconfigboard.mk b/ports/espressif/boards/seeed_xiao_esp32c6/mpconfigboard.mk
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c6
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
+CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1
diff --git a/ports/espressif/boards/spotpear_esp32c3_lcd_1_44/mpconfigboard.mk b/ports/espressif/boards/spotpear_esp32c3_lcd_1_44/mpconfigboard.mk
@@ -8,4 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
diff --git a/ports/espressif/boards/sqfmi_watchy/mpconfigboard.mk b/ports/espressif/boards/sqfmi_watchy/mpconfigboard.mk
@@ -1,13 +1,10 @@
 CIRCUITPY_CREATOR_ID = 0x4496E3F4
 CIRCUITPY_CREATION_ID = 0x00320024
 
-
-CIRCUITPY_ESPCAMERA = 0
+IDF_TARGET = esp32
 
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
-IDF_TARGET = esp32
+CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/sunton_esp32_2424S012/mpconfigboard.mk b/ports/espressif/boards/sunton_esp32_2424S012/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=qio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
diff --git a/ports/espressif/boards/sunton_esp32_2432S024C/mpconfigboard.mk b/ports/espressif/boards/sunton_esp32_2432S024C/mpconfigboard.mk
@@ -8,7 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESPCAMERA = 0
-
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
-CIRCUITPY_BUILD_EXTENSIONS = bin
diff --git a/ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.mk b/ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESPCAMERA = 0
-
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinypico/mpconfigboard.mk
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinypico_nano/mpconfigboard.mk
diff --git a/ports/espressif/boards/waveshare_esp32_c6_lcd_1_47/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32_c6_lcd_1_47/mpconfigboard.mk
diff --git a/ports/espressif/boards/weact_esp32c6_n4/mpconfigboard.mk b/ports/espressif/boards/weact_esp32c6_n4/mpconfigboard.mk
diff --git a/ports/espressif/boards/wemos_lolin32_lite/mpconfigboard.mk b/ports/espressif/boards/wemos_lolin32_lite/mpconfigboard.mk
diff --git a/ports/espressif/esp-idf-config/partitions-4MB-no-ota-no-uf2-large-user_fs.csv b/ports/espressif/esp-idf-config/partitions-4MB-no-ota-no-uf2-large-user_fs.csv
diff --git a/ports/espressif/esp-idf-config/partitions-4MB-no-ota-no-uf2.csv b/ports/espressif/esp-idf-config/partitions-4MB-no-ota-no-uf2.csv
diff --git a/ports/espressif/esp-idf-config/sdkconfig-flash-4MB-no-ota-no-uf2-large-user_fs.defaults b/ports/espressif/esp-idf-config/sdkconfig-flash-4MB-no-ota-no-uf2-large-user_fs.defaults
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
