diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index fbb0f54a397cc..a063101991fdb 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -571,27 +571,23 @@ TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
 UF2_BOOTLOADER ?= $(CIRCUITPY_USB_DEVICE)
 
 ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
-####### No 2MB UF2 boards, so always no OTA, not UF2
+# ..... No 2MB UF2 boards, so always no OTA, not UF2
 	FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
 else ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 4MB)
 	ifeq ($(UF2_BOOTLOADER), 1)
-############### TODO: For right now, use no-ota only for ESP32-S3. Eventually it will be for ESP32-S2 as well.
-		ifeq ($(IDF_TARGET),esp32s3)
-			FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
-		else
-			FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
-		endif
+#.............  ESP32-S2 and ESP32-S3 do not have an extra ota partition for OTA update.
+		FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
 	else
-############### Non-UF2 4MB: C3, C6, etc.
+# ............. Non-UF2 4MB: C3, C6, etc.
 		ifeq ($(CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT), 1)
-######################  Some boards use a 2MB firmware and almost 2MB user filesystem, for historical reasons.
+# ....................  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
 	endif
 else
-####### All the rest are >4MB flash
+# ..... All the rest are >4MB flash
 	ifeq ($(UF2_BOOTLOADER), 1)
 		FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
 	else
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
index bf0dc3f320f50..cdf1657d8bea5 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
index c6ca0ba66eb4b..f948521eb6d84 100644
--- a/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
index e956964776ca4..43045b4cd984d 100644
--- a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
@@ -9,6 +9,11 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+CIRCUITPY_ESP_PSRAM_SIZE = 2MB
+CIRCUITPY_ESP_PSRAM_MODE = qio
+CIRCUITPY_ESP_PSRAM_FREQ = 80m
+
+# Specialized board.
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_MAX3421E = 0
 CIRCUITPY_PS2IO = 0
@@ -21,7 +26,3 @@ CIRCUITPY_FRAMEBUFFERIO = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-
-CIRCUITPY_ESP_PSRAM_SIZE = 2MB
-CIRCUITPY_ESP_PSRAM_MODE = qio
-CIRCUITPY_ESP_PSRAM_FREQ = 80m
diff --git a/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk b/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk
index 3d53e15942220..9b816b2ba2833 100644
--- a/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
index b3f0dd9165a0c..582eb32eaef6f 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
@@ -13,7 +13,6 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
 
-CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
 
 # Include these Python libraries in firmware.
diff --git a/ports/espressif/boards/adafruit_matrixportal_s3/mpconfigboard.mk b/ports/espressif/boards/adafruit_matrixportal_s3/mpconfigboard.mk
index 51a03b346102b..e213980ccdfe0 100644
--- a/ports/espressif/boards/adafruit_matrixportal_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_matrixportal_s3/mpconfigboard.mk
@@ -13,7 +13,6 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
 
-CIRCUITPY_ESPCAMERA = 0
-
 # Not enough pins.
+CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
diff --git a/ports/espressif/boards/adafruit_mini_sparkle_motion/mpconfigboard.mk b/ports/espressif/boards/adafruit_mini_sparkle_motion/mpconfigboard.mk
index db773603e186a..25c857fc597f0 100644
--- a/ports/espressif/boards/adafruit_mini_sparkle_motion/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_mini_sparkle_motion/mpconfigboard.mk
@@ -7,5 +7,6 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+# Few pins.
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
index 43ac269cd099f..053b15647c1a0 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk
@@ -10,7 +10,5 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
-CIRCUITPY_ESPCAMERA = 0
-
-# Not enough pins.
+# Few pins.
 CIRCUITPY_PARALLELDISPLAYBUS = 0
diff --git a/ports/espressif/boards/adafruit_sparkle_motion/mpconfigboard.mk b/ports/espressif/boards/adafruit_sparkle_motion/mpconfigboard.mk
index c850d8c9e70ec..2765a63cef621 100644
--- a/ports/espressif/boards/adafruit_sparkle_motion/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_sparkle_motion/mpconfigboard.mk
@@ -7,5 +7,6 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+# Very few pins.
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
diff --git a/ports/espressif/boards/adafruit_sparkle_motion_stick/mpconfigboard.mk b/ports/espressif/boards/adafruit_sparkle_motion_stick/mpconfigboard.mk
index dafd6c1231a0a..d1bfe2f974274 100644
--- a/ports/espressif/boards/adafruit_sparkle_motion_stick/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_sparkle_motion_stick/mpconfigboard.mk
@@ -6,6 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_BLEIO_NATIVE = 0
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/arduino_nano_esp32s3/mpconfigboard.mk b/ports/espressif/boards/arduino_nano_esp32s3/mpconfigboard.mk
index 3abf3d9afcbb5..4974b7a9c89c6 100644
--- a/ports/espressif/boards/arduino_nano_esp32s3/mpconfigboard.mk
+++ b/ports/espressif/boards/arduino_nano_esp32s3/mpconfigboard.mk
@@ -21,5 +21,3 @@ CIRCUITPY_ESP_PSRAM_FREQ = 80m
 INTERNAL_FLASH_FILESYSTEM = 0
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25WQ128E
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/mpconfigboard.mk b/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/mpconfigboard.mk
index 3abf3d9afcbb5..4974b7a9c89c6 100644
--- a/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/mpconfigboard.mk
+++ b/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/mpconfigboard.mk
@@ -21,5 +21,3 @@ CIRCUITPY_ESP_PSRAM_FREQ = 80m
 INTERNAL_FLASH_FILESYSTEM = 0
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25WQ128E
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/barduino/mpconfigboard.mk b/ports/espressif/boards/barduino/mpconfigboard.mk
index fed67ab635b61..61c5feea811d4 100644
--- a/ports/espressif/boards/barduino/mpconfigboard.mk
+++ b/ports/espressif/boards/barduino/mpconfigboard.mk
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk b/ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk
index e9dd3da71f462..a9bb35b51f7b4 100644
--- a/ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk
+++ b/ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk
@@ -9,9 +9,9 @@ CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-# Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/columbia-dsl-sensor/mpconfigboard.mk b/ports/espressif/boards/columbia-dsl-sensor/mpconfigboard.mk
index 9d11052ee5c55..f37fe88a4fcf1 100644
--- a/ports/espressif/boards/columbia-dsl-sensor/mpconfigboard.mk
+++ b/ports/espressif/boards/columbia-dsl-sensor/mpconfigboard.mk
@@ -12,5 +12,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk b/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
index 640a52da777bc..861ae00b0f590 100644
--- a/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
+++ b/ports/espressif/boards/crcibernetica-ideaboard/mpconfigboard.mk
@@ -7,8 +7,6 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
-CIRCUITPY_ESPCAMERA = 0
-
 # Include these Python libraries in firmware
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ConnectionManager
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
diff --git a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
index 86fefedfb9557..707687b5cf3fd 100644
--- a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
+++ b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
@@ -9,11 +9,11 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+CIRCUITPY_ESP_PSRAM_SIZE = 2MB
+CIRCUITPY_ESP_PSRAM_MODE = qio
+CIRCUITPY_ESP_PSRAM_FREQ = 80m
+
 CIRCUITPY_BITBANG_APA102 = 1
 
 # Include these Python libraries in firmware.
 # FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
-
-CIRCUITPY_ESP_PSRAM_SIZE = 2MB
-CIRCUITPY_ESP_PSRAM_MODE = qio
-CIRCUITPY_ESP_PSRAM_FREQ = 80m
diff --git a/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk
index 448ecf3a07477..5a2fd709a5e33 100644
--- a/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk
+++ b/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk
@@ -13,8 +13,3 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
-CIRCUITPY_BITMAPFILTER = 0
-CIRCUITPY_CODEOP = 0
-CIRCUITPY_PARALLELDISPLAYBUS = 0
diff --git a/ports/espressif/boards/deneyap_mini/mpconfigboard.mk b/ports/espressif/boards/deneyap_mini/mpconfigboard.mk
index e446896107088..8f6257ff02b1e 100644
--- a/ports/espressif/boards/deneyap_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/deneyap_mini/mpconfigboard.mk
@@ -9,5 +9,3 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk b/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk
index bdac1e9559f07..01db9cff0901d 100644
--- a/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk
+++ b/ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/elecrow_crowpanel_4_2_epaper/mpconfigboard.mk b/ports/espressif/boards/elecrow_crowpanel_4_2_epaper/mpconfigboard.mk
index 5b6e293439c64..3f14971607b97 100644
--- a/ports/espressif/boards/elecrow_crowpanel_4_2_epaper/mpconfigboard.mk
+++ b/ports/espressif/boards/elecrow_crowpanel_4_2_epaper/mpconfigboard.mk
@@ -15,5 +15,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-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
index 495a505fe7616..aa34430a34c88 100644
--- a/ports/espressif/boards/espressif_esp32_devkitc_v4_wroom_32e/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32_devkitc_v4_wroom_32e/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32_devkitc_v4_wrover/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32_devkitc_v4_wrover/mpconfigboard.mk
index 6ff7d4e519bd5..848c55d54c161 100644
--- a/ports/espressif/boards/espressif_esp32_devkitc_v4_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32_devkitc_v4_wrover/mpconfigboard.mk
@@ -7,8 +7,6 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
-CIRCUITPY_ESPCAMERA = 0
-
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 40m
diff --git a/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.mk
index b1dd2f9f8774d..664c24c358fb8 100644
--- a/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 4MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 40m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
index 765f9968a996e..6c117b1f67e61 100644
--- a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
@@ -12,5 +12,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
index fe83e2e34ddb6..e54f55fd642ee 100644
--- a/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_box_lite/mpconfigboard.mk
@@ -12,5 +12,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n16/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n16/mpconfigboard.mk
index 0a7925420f723..d182a14499253 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n16/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n16/mpconfigboard.mk
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
index bd2cd4c0a3374..ea5597d3702a7 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
index fdbd686e09022..5a410afaa06eb 100644
--- a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.mk
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
index 947b689fafe6d..b0abc22141806 100644
--- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/mpconfigboard.mk
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
index d00bf432c976f..cb766aa231236 100644
--- a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
index f4f7ae7a5891a..7b4f1e9d1d232 100644
--- a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
@@ -8,5 +8,3 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
index a06ac482090a8..a77626e5104ea 100644
--- a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/heltec_esp32s3_wifi_lora_v3/mpconfigboard.mk b/ports/espressif/boards/heltec_esp32s3_wifi_lora_v3/mpconfigboard.mk
index 383961a832798..d5cbac7ea59d4 100644
--- a/ports/espressif/boards/heltec_esp32s3_wifi_lora_v3/mpconfigboard.mk
+++ b/ports/espressif/boards/heltec_esp32s3_wifi_lora_v3/mpconfigboard.mk
@@ -20,9 +20,5 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
-CIRCUITPY_ESPCAMERA = 0
-
-CIRCUITPY_DISPLAYIO = 1
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Shapes
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
diff --git a/ports/espressif/boards/heltec_vision_master_e290/mpconfigboard.mk b/ports/espressif/boards/heltec_vision_master_e290/mpconfigboard.mk
index 38b34592fc2ad..e5ab355fee9ec 100644
--- a/ports/espressif/boards/heltec_vision_master_e290/mpconfigboard.mk
+++ b/ports/espressif/boards/heltec_vision_master_e290/mpconfigboard.mk
@@ -12,5 +12,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/heltec_wireless_paper/mpconfigboard.mk b/ports/espressif/boards/heltec_wireless_paper/mpconfigboard.mk
index d949cb01a85cf..35a9ac1402ed7 100644
--- a/ports/espressif/boards/heltec_wireless_paper/mpconfigboard.mk
+++ b/ports/espressif/boards/heltec_wireless_paper/mpconfigboard.mk
@@ -19,7 +19,3 @@ CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-
-CIRCUITPY_ESPCAMERA = 0
-
-CIRCUITPY_DISPLAYIO = 1
diff --git a/ports/espressif/boards/hexky_s2/mpconfigboard.mk b/ports/espressif/boards/hexky_s2/mpconfigboard.mk
index 94d98aa8654d5..825d8721333bf 100644
--- a/ports/espressif/boards/hexky_s2/mpconfigboard.mk
+++ b/ports/espressif/boards/hexky_s2/mpconfigboard.mk
@@ -10,8 +10,8 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk b/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk
index 743acf85a4587..3d3c584c7024b 100644
--- a/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk
+++ b/ports/espressif/boards/hiibot_iots2/mpconfigboard.mk
@@ -8,7 +8,6 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-#CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
diff --git a/ports/espressif/boards/lilygo_tdeck/mpconfigboard.mk b/ports/espressif/boards/lilygo_tdeck/mpconfigboard.mk
index 369fba4e1a0d9..fc30e96c793aa 100644
--- a/ports/espressif/boards/lilygo_tdeck/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_tdeck/mpconfigboard.mk
@@ -13,6 +13,7 @@ CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
 
+# Few pins.
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_MAX3421E = 0
 CIRCUITPY_PS2IO = 0
diff --git a/ports/espressif/boards/lilygo_tdongle_s3/mpconfigboard.mk b/ports/espressif/boards/lilygo_tdongle_s3/mpconfigboard.mk
index fe407f3625c13..bc883366b5d8c 100644
--- a/ports/espressif/boards/lilygo_tdongle_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_tdongle_s3/mpconfigboard.mk
@@ -9,4 +9,5 @@ CIRCUITPY_ESP_FLASH_SIZE = 16MB
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 
+# Few pins.
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/lilygo_tqt_pro_nopsram/mpconfigboard.mk b/ports/espressif/boards/lilygo_tqt_pro_nopsram/mpconfigboard.mk
index 6592aaff4a474..5c7ff943cb31d 100644
--- a/ports/espressif/boards/lilygo_tqt_pro_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_tqt_pro_nopsram/mpconfigboard.mk
@@ -9,6 +9,6 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
-CIRCUITPY_ESPCAMERA = 0
 # Not enough pins.
+CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
diff --git a/ports/espressif/boards/lilygo_tqt_pro_psram/mpconfigboard.mk b/ports/espressif/boards/lilygo_tqt_pro_psram/mpconfigboard.mk
index f8d9e102e78ed..2006f98fbd7d9 100644
--- a/ports/espressif/boards/lilygo_tqt_pro_psram/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_tqt_pro_psram/mpconfigboard.mk
@@ -13,6 +13,6 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
 
-CIRCUITPY_ESPCAMERA = 0
 # Not enough pins.
+CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.mk
index dd177ec1c900d..e76ffaba31020 100644
--- a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
-
-CIRCUITPY_ESPCAMERA = 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
index 56912e66645ac..8e89a6a2b3aa4 100644
--- a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_4m/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_4m/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/lilygo_twatch_s3/mpconfigboard.mk b/ports/espressif/boards/lilygo_twatch_s3/mpconfigboard.mk
index 5d63032d5bf30..1d3154c18265f 100644
--- a/ports/espressif/boards/lilygo_twatch_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_twatch_s3/mpconfigboard.mk
@@ -10,6 +10,11 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
 
+CIRCUITPY_ESP_PSRAM_SIZE = 8MB
+CIRCUITPY_ESP_PSRAM_MODE = opi
+CIRCUITPY_ESP_PSRAM_FREQ = 80m
+
+# Specialized board.
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
 CIRCUITPY_MAX3421E = 0
@@ -19,10 +24,6 @@ CIRCUITPY_PS2IO = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_ROTARYIO = 0
 
-CIRCUITPY_ESP_PSRAM_SIZE = 8MB
-CIRCUITPY_ESP_PSRAM_MODE = opi
-CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FocalTouch
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_IRRemote
diff --git a/ports/espressif/boards/lolin_s3/mpconfigboard.mk b/ports/espressif/boards/lolin_s3/mpconfigboard.mk
index fbcdece670b4e..a86dd6578bd3d 100644
--- a/ports/espressif/boards/lolin_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_s3/mpconfigboard.mk
@@ -12,5 +12,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/lolin_s3_pro/mpconfigboard.mk b/ports/espressif/boards/lolin_s3_pro/mpconfigboard.mk
index 9df3f3580cd7d..f20732df49c68 100755
--- a/ports/espressif/boards/lolin_s3_pro/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_s3_pro/mpconfigboard.mk
@@ -12,5 +12,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk
index 8ae3dfce95fa7..c896ed0c8a4ab 100644
--- a/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
index ff7db6a63b723..5ca1db04f3b50 100644
--- a/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk
index 298082eb6bed3..ace0e7f02cf89 100644
--- a/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk b/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk
index 20ef88d601c71..0f8ab59f7445d 100644
--- a/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atoms3/mpconfigboard.mk b/ports/espressif/boards/m5stack_atoms3/mpconfigboard.mk
index 9bc53033a1f5d..7738713aa530c 100644
--- a/ports/espressif/boards/m5stack_atoms3/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atoms3/mpconfigboard.mk
@@ -8,4 +8,6 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
+
+# Few pins.
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.mk b/ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.mk
index 8bb5ab76d856d..736fb3222b57e 100644
--- a/ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atoms3_lite/mpconfigboard.mk
@@ -8,4 +8,6 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
+
+# Few pins.
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_atoms3u/mpconfigboard.mk b/ports/espressif/boards/m5stack_atoms3u/mpconfigboard.mk
index dc65fefc4bf86..e68f4efdc65e8 100644
--- a/ports/espressif/boards/m5stack_atoms3u/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_atoms3u/mpconfigboard.mk
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_cardputer/mpconfigboard.mk b/ports/espressif/boards/m5stack_cardputer/mpconfigboard.mk
index 6e9aaa764202d..cd18ccf8a5a81 100644
--- a/ports/espressif/boards/m5stack_cardputer/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_cardputer/mpconfigboard.mk
@@ -8,9 +8,9 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESPCAMERA = 0
 
-CIRCUITPY_GIFIO = 1
+# Very few pins.
+CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_MAX3421E = 0
 
 SRC_C += boards/$(BOARD)/cardputer_keyboard.c
diff --git a/ports/espressif/boards/m5stack_cardputer_ros/mpconfigboard.mk b/ports/espressif/boards/m5stack_cardputer_ros/mpconfigboard.mk
index 8d296939a1a7b..573f947f0a8f5 100644
--- a/ports/espressif/boards/m5stack_cardputer_ros/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_cardputer_ros/mpconfigboard.mk
@@ -8,10 +8,11 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESPCAMERA = 0
+
 CIRCUITPY_RCLCPY = 1
 
-CIRCUITPY_GIFIO = 1
+# Very few pins.
+CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_MAX3421E = 0
 
 SRC_C += boards/$(BOARD)/cardputer_keyboard.c
diff --git a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk
index dedcde81e63b7..964f61a04f42e 100644
--- a/ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_core_basic/mpconfigboard.mk
@@ -6,4 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
index 591c596bbcfee..e62fd3d4e57d0 100644
--- a/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_core_fire/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_dial/mpconfigboard.mk b/ports/espressif/boards/m5stack_dial/mpconfigboard.mk
index cfdb0f1690541..b87b5e6f92543 100644
--- a/ports/espressif/boards/m5stack_dial/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_dial/mpconfigboard.mk
@@ -10,7 +10,6 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
+# Very few pins.
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
-
-OPTIMIZATION_FLAGS = -Os
diff --git a/ports/espressif/boards/m5stack_m5paper/mpconfigboard.mk b/ports/espressif/boards/m5stack_m5paper/mpconfigboard.mk
index bacf270a66387..bbc072632737b 100644
--- a/ports/espressif/boards/m5stack_m5paper/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_m5paper/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_SIZE = 16MB
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/m5stack_stamp_s3/mpconfigboard.mk b/ports/espressif/boards/m5stack_stamp_s3/mpconfigboard.mk
index b27fbb3dc2c14..d2f1bc3c47167 100644
--- a/ports/espressif/boards/m5stack_stamp_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_stamp_s3/mpconfigboard.mk
@@ -8,7 +8,6 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-CIRCUITPY_ESPCAMERA = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
index 4454fdb9d712c..7f8b24c808105 100644
--- a/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-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
index 6941931977d18..8960a568feb47 100644
--- a/ports/espressif/boards/m5stack_stick_c_plus/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_stick_c_plus/mpconfigboard.mk
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESPCAMERA = 0
-
 SRC_C += pmic/axp192/axp192.c
diff --git a/ports/espressif/boards/magiclick_s3_n4r2/mpconfigboard.mk b/ports/espressif/boards/magiclick_s3_n4r2/mpconfigboard.mk
index 6c2159c647844..fe2eb2c7a7690 100644
--- a/ports/espressif/boards/magiclick_s3_n4r2/mpconfigboard.mk
+++ b/ports/espressif/boards/magiclick_s3_n4r2/mpconfigboard.mk
@@ -14,5 +14,6 @@ CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 
+# No pins.
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_DISPLAYIO = 1
diff --git a/ports/espressif/boards/maker_badge/mpconfigboard.mk b/ports/espressif/boards/maker_badge/mpconfigboard.mk
index 979ae581e3dbe..13229c02dbf47 100644
--- a/ports/espressif/boards/maker_badge/mpconfigboard.mk
+++ b/ports/espressif/boards/maker_badge/mpconfigboard.mk
@@ -3,14 +3,12 @@ USB_PID = 0x2030
 USB_PRODUCT = "Maker badge"
 USB_MANUFACTURER = "Czech maker"
 
-CIRCUITPY_ESPCAMERA = 0
+IDF_TARGET = esp32s2
 
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
-IDF_TARGET = esp32s2
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ConnectionManager
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
index 1d370fd30e712..9b96aa31c9eae 100644
--- a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
@@ -9,12 +9,6 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_AESIO = 0
-CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_CANIO = 0
-CIRCUITPY_CODEOP = 0
-CIRCUITPY_ESPCAMERA = 0
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ConnectionManager
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
index 96e298f8e4886..d6447ee7134e8 100644
--- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
+++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
@@ -9,15 +9,9 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_ESPCAMERA = 0
-# TODO: Remove after partition expansion
-CIRCUITPY_AESIO = 0
-CIRCUITPY_KEYPAD_DEMUX = 0
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ConnectionManager
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib
 
 CIRCUITPY_MESSAGE_COMPRESSION_LEVEL = 9
-OPTIMIZATION_FLAGS = -Os
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
index bb3c0ea4d829c..b2540a8c3b872 100644
--- a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/oxocard_artwork/mpconfigboard.mk b/ports/espressif/boards/oxocard_artwork/mpconfigboard.mk
index a7dfe8b8e33ae..61367774a2195 100644
--- a/ports/espressif/boards/oxocard_artwork/mpconfigboard.mk
+++ b/ports/espressif/boards/oxocard_artwork/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/oxocard_connect/mpconfigboard.mk b/ports/espressif/boards/oxocard_connect/mpconfigboard.mk
index 49b8a4f4c879d..ea00787921d63 100644
--- a/ports/espressif/boards/oxocard_connect/mpconfigboard.mk
+++ b/ports/espressif/boards/oxocard_connect/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/oxocard_galaxy/mpconfigboard.mk b/ports/espressif/boards/oxocard_galaxy/mpconfigboard.mk
index 915d7cc5862a3..e4786df383ce8 100644
--- a/ports/espressif/boards/oxocard_galaxy/mpconfigboard.mk
+++ b/ports/espressif/boards/oxocard_galaxy/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/oxocard_science/mpconfigboard.mk b/ports/espressif/boards/oxocard_science/mpconfigboard.mk
index d31be7d799292..9d89108f39224 100644
--- a/ports/espressif/boards/oxocard_science/mpconfigboard.mk
+++ b/ports/espressif/boards/oxocard_science/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk b/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk
index e12fb443f6d1b..33a83f954a7c4 100644
--- a/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.mk b/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.mk
index a8c32ae88dfea..9d3fbecabde71 100644
--- a/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.mk
+++ b/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.mk
@@ -9,8 +9,6 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 
-CIRCUITPY_ESPCAMERA = 0
-
 CIRCUITPY_REQUIRE_I2C_PULLUPS = 0
 CIRCUITPY_I2C_ALLOW_STRAPPING_PINS = 1
 
diff --git a/ports/espressif/boards/smartbeedesigns_bee_data_logger/mpconfigboard.mk b/ports/espressif/boards/smartbeedesigns_bee_data_logger/mpconfigboard.mk
index 6ded5c4e1984a..6465252ac46c2 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_data_logger/mpconfigboard.mk
+++ b/ports/espressif/boards/smartbeedesigns_bee_data_logger/mpconfigboard.mk
@@ -9,10 +9,8 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DS3231
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
index 72ad30af2e0c4..5bfa7340d5687 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/mpconfigboard.mk
@@ -9,6 +9,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
index 095924385b7a7..fc11e4bd21c20 100644
--- a/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
+++ b/ports/espressif/boards/smartbeedesigns_bee_s3/mpconfigboard.mk
@@ -9,6 +9,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/sqfmi_watchy/mpconfigboard.mk b/ports/espressif/boards/sqfmi_watchy/mpconfigboard.mk
index 7451083de642d..b1c8c64f8ba34 100644
--- a/ports/espressif/boards/sqfmi_watchy/mpconfigboard.mk
+++ b/ports/espressif/boards/sqfmi_watchy/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/sunton_esp32_2432S024C/mpconfigboard.mk b/ports/espressif/boards/sunton_esp32_2432S024C/mpconfigboard.mk
index dadd6e11f3df6..fcb3e98458e29 100644
--- a/ports/espressif/boards/sunton_esp32_2432S024C/mpconfigboard.mk
+++ b/ports/espressif/boards/sunton_esp32_2432S024C/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.mk b/ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.mk
index a37e9420d6ae5..d4c4fb94c71ca 100644
--- a/ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.mk
+++ b/ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/sunton_esp32_2432S032C/mpconfigboard.mk b/ports/espressif/boards/sunton_esp32_2432S032C/mpconfigboard.mk
index 15e3b102c9bf3..f36374a456aa9 100644
--- a/ports/espressif/boards/sunton_esp32_2432S032C/mpconfigboard.mk
+++ b/ports/espressif/boards/sunton_esp32_2432S032C/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
index 2e0e84456cbd9..f273085b19234 100644
--- a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
@@ -8,5 +8,3 @@ IDF_TARGET = esp32s2
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/ttgo_t8_v1_7/mpconfigboard.mk b/ports/espressif/boards/ttgo_t8_v1_7/mpconfigboard.mk
index eb9259cdf0e8e..aa9f2e1c1b391 100644
--- a/ports/espressif/boards/ttgo_t8_v1_7/mpconfigboard.mk
+++ b/ports/espressif/boards/ttgo_t8_v1_7/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 CIRCUITPY_ESP_PSRAM_SIZE = 4MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/waveshare_esp32_s3_lcd_1_28/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32_s3_lcd_1_28/mpconfigboard.mk
index a8ac3b5d24551..f4d1f33be7938 100644
--- a/ports/espressif/boards/waveshare_esp32_s3_lcd_1_28/mpconfigboard.mk
+++ b/ports/espressif/boards/waveshare_esp32_s3_lcd_1_28/mpconfigboard.mk
@@ -21,4 +21,5 @@ INTERNAL_FLASH_FILESYSTEM = 0
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = W25Q128JVxQ
 
+# Not enough pins.
 CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/wemos_lolin32_lite/mpconfigboard.mk b/ports/espressif/boards/wemos_lolin32_lite/mpconfigboard.mk
index 8e44971792a67..83e2289e7290d 100644
--- a/ports/espressif/boards/wemos_lolin32_lite/mpconfigboard.mk
+++ b/ports/espressif/boards/wemos_lolin32_lite/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index ae8d6def12850..66c7befd11c5d 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -262,11 +262,6 @@ CIRCUITPY_SDIOIO = 0
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0
 
-# TODO: remove this after ESP32-S2 4MB boards get combined OTA partition.
-ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),4MB)
-CIRCUITPY__EVE = 0
-endif
-
 else ifeq ($(IDF_TARGET),esp32s3)
 # Modules
 CIRCUITPY_ALARM_TOUCH = 1