Skip to content

Make ESP32-S3 4MB boards use no-ota partition table #10458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 29 additions & 18 deletions ports/espressif/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,12 @@ else
endif

ifeq ($(IDF_TARGET_ARCH),xtensa)
# Remove the last two flags once TinyUSB is updated with the `#include <xtensa_api.h>` instead of
# `#include "xtensa/xtensa_api.h"`.
# Remove the last two flags once TinyUSB is updated with the `#include <xtensa_api.h>` instead of
# `#include "xtensa/xtensa_api.h"`.

CFLAGS += -mlongcalls -isystem esp-idf/components/xtensa/deprecated_include/ -Wno-error=cpp

# Wrap longjmp with a patched version that protects register window update with a critical section
# Wrap longjmp with a patched version that protects register window update with a critical section
LDFLAGS += -Wl,--wrap=longjmp
else ifeq ($(IDF_TARGET_ARCH),riscv)

Expand Down Expand Up @@ -567,27 +567,38 @@ $(BUILD)/esp-idf:
TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults


# Choose the correct partition layout, based on UF2 or not, flash size, etc.
UF2_BOOTLOADER ?= $(CIRCUITPY_USB_DEVICE)

ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
####### 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
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_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 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
else
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
############### 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
else
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
endif
endif
else
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-uf2.defaults
endif
endif
####### All the rest are >4MB flash
ifeq ($(UF2_BOOTLOADER), 1)
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
else
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-uf2.defaults
endif
endif

FLASH_MODE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_MODE).defaults
FLASH_SPEED_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_FREQ).defaults

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
CIRCUITPY_ESP_PSRAM_MODE = qio
CIRCUITPY_ESP_PSRAM_FREQ = 80m

# No OTA partition: larger firmware partition
FLASH_SIZE_SDKCONFIG = esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
CIRCUITPY_ESPCAMERA = 1

CIRCUITPY_AUDIOBUSIO = 0
CIRCUITPY_CANIO = 0
CIRCUITPY_DUALBANK = 0
CIRCUITPY_ESPCAMERA = 1
CIRCUITPY_FRAMEBUFFERIO = 0
CIRCUITPY_KEYPAD = 0
CIRCUITPY_ONEWIREIO = 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
CIRCUITPY_ESP_PSRAM_MODE = qio
CIRCUITPY_ESP_PSRAM_FREQ = 80m

OPTIMIZATION_FLAGS = -Os
#CIRCUITPY_ESPCAMERA = 0
#CIRCUITPY_PARALLELDISPLAYBUS = 0
CIRCUITPY_BLEIO_NATIVE = 1

FLASH_SIZE_SDKCONFIG = esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
CIRCUITPY_ESP_PSRAM_MODE = qio
CIRCUITPY_ESP_PSRAM_FREQ = 80m

CIRCUITPY_ESPCAMERA = 0
# Already have a display.
CIRCUITPY_PARALLELDISPLAYBUS = 0
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB

CIRCUITPY_ESPCAMERA = 0
CIRCUITPY_PARALLELDISPLAYBUS = 0

CIRCUITPY_ESP_PSRAM_SIZE = 2MB
CIRCUITPY_ESP_PSRAM_MODE = qio
CIRCUITPY_ESP_PSRAM_FREQ = 80m

# Already have a display.
CIRCUITPY_PARALLELDISPLAYBUS = 0
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB

CIRCUITPY_BLEIO_NATIVE = 0
CIRCUITPY_ESPCAMERA = 0
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ 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_ESPCAMERA = 0
CIRCUITPY_PARALLELDISPLAYBUS = 0

Expand All @@ -20,7 +24,3 @@ FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH

CIRCUITPY_ESP_PSRAM_SIZE = 2MB
CIRCUITPY_ESP_PSRAM_MODE = qio
CIRCUITPY_ESP_PSRAM_FREQ = 80m
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB

CIRCUITPY_BLEIO_NATIVE = 0
CIRCUITPY_ESPCAMERA = 0
CIRCUITPY_PARALLELDISPLAYBUS = 0
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB

CIRCUITPY_BLEIO_NATIVE = 0
CIRCUITPY_ESPCAMERA = 0
CIRCUITPY_PARALLELDISPLAYBUS = 0
2 changes: 1 addition & 1 deletion ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# TODO
# A better directory name for this board would be dfrobot_beetle_esp32_c3.
CIRCUITPY_CREATOR_ID = 0x10101010
CIRCUITPY_CREATION_ID = 0x00C30001

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ USB_MANUFACTURER = "ElectronicCats"

IDF_TARGET = esp32s2

CIRCUITPY_NEOPIXEL_WRITE = 0

CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
CIRCUITPY_ESPCAMERA = 0
5 changes: 0 additions & 5 deletions ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,3 @@ CIRCUITPY_ESP_PSRAM_FREQ = 40m

CIRCUITPY_CANIO = 0
CIRCUITPY_NEOPIXEL_WRITE = 0
CIRCUITPY_PIXELBUF = 0
CIRCUITPY_PS2IO = 0
CIRCUITPY_ROTARYIO = 0
CIRCUITPY_TOUCHIO = 0
CIRCUITPY_KEYPAD = 0
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@ IDF_TARGET = esp32c6
CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB

CIRCUITPY_AUDIOMP3 = 0
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ IDF_TARGET = esp32s2
CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB

CIRCUITPY_ESPCAMERA = 0
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions ports/espressif/boards/lolin_s3_mini/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,5 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
CIRCUITPY_ESP_PSRAM_MODE = qio
CIRCUITPY_ESP_PSRAM_FREQ = 80m

CIRCUITPY_ESPCAMERA = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_CODEOP = 0
CIRCUITPY_PARALLELDISPLAYBUS = 0

# Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
5 changes: 0 additions & 5 deletions ports/espressif/boards/lolin_s3_mini_pro/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,5 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
CIRCUITPY_ESP_PSRAM_MODE = qio
CIRCUITPY_ESP_PSRAM_FREQ = 80m

CIRCUITPY_ESPCAMERA = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_CODEOP = 0
CIRCUITPY_PARALLELDISPLAYBUS = 0

# Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
7 changes: 4 additions & 3 deletions ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB

CIRCUITPY_AESIO = 0
CIRCUITPY_CANIO = 0
CIRCUITPY_CODEOP = 0
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions ports/espressif/boards/sunton_esp32_2424S012/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
CIRCUITPY_ESP_FLASH_SIZE=4MB

CIRCUITPY_ESP_USB_SERIAL_JTAG = 1

# Not enough flash space.
CIRCUITPY_CODEOP = 0
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
CIRCUITPY_ESP_PSRAM_MODE = qio
CIRCUITPY_ESP_PSRAM_FREQ = 80m

# No pins.
CIRCUITPY_ESPCAMERA = 0
CIRCUITPY_DISPLAYIO = 1
CIRCUITPY_PARALLELDISPLAYBUS = 0

FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,5 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
CIRCUITPY_ESP_PSRAM_MODE = qio
CIRCUITPY_ESP_PSRAM_FREQ = 80m

CIRCUITPY_ESPCAMERA = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_CODEOP = 0
CIRCUITPY_PARALLELDISPLAYBUS = 0

# Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
1 change: 0 additions & 1 deletion ports/espressif/boards/waveshare_esp32_s3_tiny/sdkconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#
# LWIP
#
# CONFIG_LWIP_IPV6 is not set
# end of LWIP

# end of Component config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,5 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
CIRCUITPY_ESP_PSRAM_MODE = qio
CIRCUITPY_ESP_PSRAM_FREQ = 80m

CIRCUITPY_ESPCAMERA = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_CODEOP = 0
CIRCUITPY_PARALLELDISPLAYBUS = 0

# Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
2 changes: 0 additions & 2 deletions ports/espressif/boards/weact_esp32c6_n4/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@ IDF_TARGET = esp32c6
CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB

CIRCUITPY_AUDIOMP3 = 0
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy