Skip to content

Commit 710eaa7

Browse files
dhalbertdhalbert
authored
Merge pull request #10468 from dhalbert/esp32-s2-no-ota
Make ESP32-S2 4MB boards use no-ota partition table; clean up espressif mpconfigboard.mk
2 parents ee87ac0 + 47259d7 commit 710eaa7

File tree

87 files changed

+46
-177
lines changed

Some content is hidden

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

87 files changed

+46
-177
lines changed

‎ports/espressif/Makefile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -571,27 +571,23 @@ TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
571571
UF2_BOOTLOADER ?= $(CIRCUITPY_USB_DEVICE)
572572

573573
ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
574-
####### No 2MB UF2 boards, so always no OTA, not UF2
574+
# ..... No 2MB UF2 boards, so always no OTA, not UF2
575575
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
576576
else ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 4MB)
577577
ifeq ($(UF2_BOOTLOADER), 1)
578-
############### TODO: For right now, use no-ota only for ESP32-S3. Eventually it will be for ESP32-S2 as well.
579-
ifeq ($(IDF_TARGET),esp32s3)
580-
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
581-
else
582-
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
583-
endif
578+
#............. ESP32-S2 and ESP32-S3 do not have an extra ota partition for OTA update.
579+
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
584580
else
585-
############### Non-UF2 4MB: C3, C6, etc.
581+
# ............. Non-UF2 4MB: C3, C6, etc.
586582
ifeq ($(CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT), 1)
587-
###################### Some boards use a 2MB firmware and almost 2MB user filesystem, for historical reasons.
583+
# .................... Some boards use a 2MB firmware and almost 2MB user filesystem, for historical reasons.
588584
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2-large-user_fs.defaults
589585
else
590586
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
591587
endif
592588
endif
593589
else
594-
####### All the rest are >4MB flash
590+
# ..... All the rest are >4MB flash
595591
ifeq ($(UF2_BOOTLOADER), 1)
596592
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
597593
else

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

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

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

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

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ CIRCUITPY_ESP_FLASH_MODE = qio
99
CIRCUITPY_ESP_FLASH_FREQ = 80m
1010
CIRCUITPY_ESP_FLASH_SIZE = 4MB
1111

12+
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
13+
CIRCUITPY_ESP_PSRAM_MODE = qio
14+
CIRCUITPY_ESP_PSRAM_FREQ = 80m
15+
16+
# Specialized board.
1217
CIRCUITPY_ESPCAMERA = 0
1318
CIRCUITPY_MAX3421E = 0
1419
CIRCUITPY_PS2IO = 0
@@ -21,7 +26,3 @@ CIRCUITPY_FRAMEBUFFERIO = 0
2126

2227
# Include these Python libraries in firmware.
2328
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
24-
25-
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
26-
CIRCUITPY_ESP_PSRAM_MODE = qio
27-
CIRCUITPY_ESP_PSRAM_FREQ = 80m

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

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

‎ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk

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

16-
CIRCUITPY_ESPCAMERA = 0
1716
CIRCUITPY_PARALLELDISPLAYBUS = 0
1817

1918
# Include these Python libraries in firmware.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
1313
CIRCUITPY_ESP_PSRAM_MODE = qio
1414
CIRCUITPY_ESP_PSRAM_FREQ = 80m
1515

16-
CIRCUITPY_ESPCAMERA = 0
17-
1816
# Not enough pins.
17+
CIRCUITPY_ESPCAMERA = 0
1918
CIRCUITPY_PARALLELDISPLAYBUS = 0

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

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

10+
# Few pins.
1011
CIRCUITPY_ESPCAMERA = 0
1112
CIRCUITPY_PARALLELDISPLAYBUS = 0

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,5 @@ CIRCUITPY_ESP_FLASH_MODE = qio
1010
CIRCUITPY_ESP_FLASH_FREQ = 80m
1111
CIRCUITPY_ESP_FLASH_SIZE = 8MB
1212

13-
CIRCUITPY_ESPCAMERA = 0
14-
15-
# Not enough pins.
13+
# Few pins.
1614
CIRCUITPY_PARALLELDISPLAYBUS = 0

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

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

10+
# Very few pins.
1011
CIRCUITPY_ESPCAMERA = 0
1112
CIRCUITPY_PARALLELDISPLAYBUS = 0

0 commit comments

Comments
 (0)
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