use larger partition for ESP32-S2

Author: dhalbert

ports/espressif/Makefile

@@ -571,18 +571,14 @@ 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.
 			FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2-large-user_fs.defaults

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