leave non-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT boards as is

dhalbert · dhalbert · commit 9c10fcecd489 · 2025-06-15T17:50:22.000-04:00
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
@@ -523,11 +523,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/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/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_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_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/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/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/m5stack_stick_c_plus/mpconfigboard.mk b/ports/espressif/boards/m5stack_stick_c_plus/mpconfigboard.mk
@@ -7,6 +7,6 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
-
 CIRCUITPY_ESPCAMERA = 0
+
+SRC_C += pmic/axp192/axp192.c
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/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_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/waveshare_esp32_c6_lcd_1_47/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32_c6_lcd_1_47/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/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
@@ -0,0 +1,7 @@
+# Name,             Type,   SubType,    Offset,     Size
+# bootloader,       app,    boot,       0x1000/0x0, 28/32K
+# partition_table,  data,   table,      0x8000,     4K
+nvs,                data,   nvs,        0x9000,     20K
+otadata,            data,   ota,        0xe000,     8K
+ota_0,              app,    ota_0,      0x10000,    2048K
+user_fs,            data,   fat,        0x210000,   1984K
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
@@ -3,5 +3,5 @@
 # partition_table,  data,   table,      0x8000,     4K
 nvs,                data,   nvs,        0x9000,     20K
 otadata,            data,   ota,        0xe000,     8K
-ota_0,              app,    ota_0,      0x10000,    2048K
-user_fs,            data,   fat,        0x210000,   1984K
+ota_0,              app,    ota_0,      0x10000,    2816K
+user_fs,            data,   fat,        0x2d0000,   1216K
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
@@ -0,0 +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"
+# end of Serial flasher config
+
+#
+# Partition Table
+#
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-no-ota-no-uf2-large-user_fs.csv"
+CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-ota-no-uf2-large-user_fs.csv"
+# end of Partition Table
+
+# end of Espressif IoT Development Framework Configuration
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
@@ -30,9 +30,10 @@ LONGINT_IMPL = MPZ
 # Default to no-psram
 CIRCUITPY_ESP_PSRAM_SIZE ?= 0
 
-# New 4MB boards will not have OTA support but more room for alarm, ble and other
-# newer features.
-CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT ?= 0
+# Some 4MB non-USB boards were initially defined with 2MB firmware, almost 2MB user_fs partitions.
+# Others were defined with 1.4M+1.4M (now a single 2.8MB) firmware partitions / 1.2MB user_fs.
+# Keep the former as is, so that the user filesystem will be unchanged.
+CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT ?= 0
 
 # Enable more features
 CIRCUITPY_FULL_BUILD ?= 1

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`#`
`8`	`8`	`# LWIP`
`9`	`9`	`#`
`10`		`-# CONFIG_LWIP_IPV6 is not set`
`11`	`10`	`# end of LWIP`
`12`	`11`
`13`	`12`	`# end of Component config`