Skip to content

Commit a634a47

Browse files
eightycceightycc
authored
Merge pull request #10424 from dhalbert/expand-non-usb-partitions
Expand Espressif non-usb firmware partitions
2 parents 325d49c + 9c10fce commit a634a47

File tree

59 files changed

+75
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+75
-114
lines changed

‎ports/espressif/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,11 +572,14 @@ ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
572572
else
573573
UF2_BOOTLOADER ?= $(CIRCUITPY_USB_DEVICE)
574574
ifeq ($(UF2_BOOTLOADER), 1)
575+
# UF2-capable board
575576
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
576577
else
578+
# non-UF2 partition layout
577579
ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 4MB)
578-
ifeq ($(CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT), 1)
579-
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-uf2.defaults
580+
ifeq ($(CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT), 1)
581+
# Some boards use a 2MB firmware and almost 2MB user filesystem, for historical reasons.
582+
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2-large-user_fs.defaults
580583
else
581584
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
582585
endif

‎ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1

‎ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/mpconfigboard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c6
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9+
10+
# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
11+
CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1

‎ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@ OPTIMIZATION_FLAGS = -Os
1818
#CIRCUITPY_PARALLELDISPLAYBUS = 0
1919
CIRCUITPY_BLEIO_NATIVE = 1
2020

21-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 0
2221
FLASH_SIZE_SDKCONFIG = esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults

‎ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,8 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
1311

14-
# Not enough flash space.
15-
CIRCUITPY_CODEOP = 0
16-
1712
# Not enough pins.
1813
CIRCUITPY_PARALLELDISPLAYBUS = 0
1914
CIRCUITPY_RGBMATRIX = 0

‎ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
13-
CIRCUITPY_TILEPALETTEMAPPER = 0

‎ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,4 @@ CIRCUITPY_ESP_FLASH_MODE=qio
88
CIRCUITPY_ESP_FLASH_FREQ=80m
99
CIRCUITPY_ESP_FLASH_SIZE=4MB
1010

11-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
12-
1311
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
14-
CIRCUITPY_TILEPALETTEMAPPER = 0

‎ports/espressif/boards/cezerio_dev_ESP32C6/mpconfigboard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c6
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9+
10+
# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
11+
CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1

‎ports/espressif/boards/deneyap_kart/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
1010
CIRCUITPY_ESP_PSRAM_SIZE = 8MB
1111
CIRCUITPY_ESP_PSRAM_MODE = qio
1212
CIRCUITPY_ESP_PSRAM_FREQ = 80m
13-
14-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1

‎ports/espressif/boards/deneyap_kart_1a/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
1010
CIRCUITPY_ESP_PSRAM_SIZE = 8MB
1111
CIRCUITPY_ESP_PSRAM_MODE = qio
1212
CIRCUITPY_ESP_PSRAM_FREQ = 80m
13-
14-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1

‎ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ CIRCUITPY_ESP_PSRAM_SIZE = 8MB
1414
CIRCUITPY_ESP_PSRAM_MODE = opi
1515
CIRCUITPY_ESP_PSRAM_FREQ = 80m
1616

17-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
18-
1917
CIRCUITPY_ESPCAMERA = 0
2018
CIRCUITPY_BITMAPFILTER = 0
2119
CIRCUITPY_CODEOP = 0

‎ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1

‎ports/espressif/boards/deneyap_mini/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
1010
CIRCUITPY_ESP_FLASH_FREQ = 80m
1111
CIRCUITPY_ESP_FLASH_SIZE = 4MB
1212

13-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
14-
1513
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/deneyap_mini_v2/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
1313
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
1414
CIRCUITPY_ESP_PSRAM_MODE = qio
1515
CIRCUITPY_ESP_PSRAM_FREQ = 80m
16-
17-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1

‎ports/espressif/boards/doit_esp32_devkit_v1/mpconfigboard.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ IDF_TARGET = esp32
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9-
CIRCUITPY_ESPCAMERA = 0
109

11-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
10+
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/espressif_esp32_devkitc_v4_wroom_32e/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ CIRCUITPY_ESP_PSRAM_SIZE = 8MB
1313
CIRCUITPY_ESP_PSRAM_MODE = qio
1414
CIRCUITPY_ESP_PSRAM_FREQ = 40m
1515

16-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
17-
1816
CIRCUITPY_CANIO = 0
1917
CIRCUITPY_NEOPIXEL_WRITE = 0
2018
CIRCUITPY_PIXELBUF = 0

‎ports/espressif/boards/espressif_esp32_lyrat/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@ CIRCUITPY_ESP_PSRAM_SIZE = 4MB
1111
CIRCUITPY_ESP_PSRAM_MODE = qio
1212
CIRCUITPY_ESP_PSRAM_FREQ = 40m
1313

14-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
15-
1614
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0

‎ports/espressif/boards/espressif_esp32c6_devkitm_1_n4/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_AUDIOMP3 = 0

‎ports/espressif/boards/espressif_esp32h2_devkitm_1_n4/mpconfigboard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ IDF_TARGET = esp32h2
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 48m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9+
10+
# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
11+
CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1

‎ports/espressif/boards/espressif_esp8684_devkitc_02_n4/mpconfigboard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c2
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 60m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9+
10+
# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
11+
CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1

‎ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
11+
12+
# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
13+
CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1

‎ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0

‎ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_4m/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=qio
77
CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
12-
# Not enough flash
13-
CIRCUITPY_SOCKETPOOL_IPV6 = 0
14-
1510
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
16-
CIRCUITPY_TILEPALETTEMAPPER = 0

‎ports/espressif/boards/lolin_c3_pico/mpconfigboard.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ CIRCUITPY_ESP_FLASH_MODE=qio
77
CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
1311

14-
# Not enough flash
15-
CIRCUITPY_SOCKETPOOL_IPV6 = 0
16-
1712
# Include these Python libraries in firmware.
1813
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

‎ports/espressif/boards/lolin_c3_pico/sdkconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#
88
# LWIP
99
#
10-
# CONFIG_LWIP_IPV6 is not set
1110
# end of LWIP
1211

1312
# end of Component config

‎ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=dio
77
CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1

‎ports/espressif/boards/luatos_core_esp32c3_ch343/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=dio
77
CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0

‎ports/espressif/boards/m5stack_atom_echo/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/m5stack_atom_lite/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/m5stack_atom_u/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=qio
77
CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0

‎ports/espressif/boards/m5stack_stick_c/mpconfigboard.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ IDF_TARGET = esp32
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9-
CIRCUITPY_ESPCAMERA = 0
109

11-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
10+
CIRCUITPY_ESPCAMERA = 0
1211

1312
SRC_C += pmic/axp192/axp192.c

‎ports/espressif/boards/m5stack_stick_c_plus/mpconfigboard.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ IDF_TARGET = esp32
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9-
CIRCUITPY_ESPCAMERA = 0
109

11-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
10+
CIRCUITPY_ESPCAMERA = 0
1211

1312
SRC_C += pmic/axp192/axp192.c

‎ports/espressif/boards/m5stack_timer_camera_x/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
1010
CIRCUITPY_ESP_PSRAM_SIZE = 8MB
1111
CIRCUITPY_ESP_PSRAM_MODE = opi
1212
CIRCUITPY_ESP_PSRAM_FREQ = 80m
13-
14-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1

‎ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=dio
77
CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

10-
CIRCUITPY_CODEOP = 0
11-
12-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
13-
1410
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1

‎ports/espressif/boards/makergo_esp32c6_supermini/mpconfigboard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c6
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9+
10+
# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
11+
CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1

‎ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
13-
CIRCUITPY_TILEPALETTEMAPPER = 0

‎ports/espressif/boards/nodemcu_esp32c2/mpconfigboard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c2
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 60m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9+
10+
# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
11+
CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1

‎ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1

‎ports/espressif/boards/seeed_xiao_esp32c6/mpconfigboard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ IDF_TARGET = esp32c6
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9+
10+
# Board was originally defined with a 2MB firmware, almost 2MB user filesystem. Leave it that way.
11+
CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT = 1

‎ports/espressif/boards/spotpear_esp32c3_lcd_1_44/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
11-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1

‎ports/espressif/boards/sqfmi_watchy/mpconfigboard.mk

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
CIRCUITPY_CREATOR_ID = 0x4496E3F4
22
CIRCUITPY_CREATION_ID = 0x00320024
33

4-
5-
CIRCUITPY_ESPCAMERA = 0
4+
IDF_TARGET = esp32
65

76
CIRCUITPY_ESP_FLASH_MODE=dio
87
CIRCUITPY_ESP_FLASH_FREQ=40m
98
CIRCUITPY_ESP_FLASH_SIZE=4MB
109

11-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
12-
13-
IDF_TARGET = esp32
10+
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/sunton_esp32_2424S012/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE=qio
77
CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

10-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
11-
1210
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1

‎ports/espressif/boards/sunton_esp32_2432S024C/mpconfigboard.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESPCAMERA = 0
11-
12-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
13-
14-
CIRCUITPY_BUILD_EXTENSIONS = bin

‎ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESPCAMERA = 0
11-
12-
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1

0 commit comments

Comments
 (0)