Skip to content

Commit 46d7771

Browse files
committed
tinyuf2 adopted the partition scheme called "1ota"
.. which irritated our partition table parser in build_memory_info, so make it work again.
1 parent c026704 commit 46d7771

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ IDF_TARGET = esp32s3
88
CIRCUITPY_ESP_FLASH_MODE = dio
99
CIRCUITPY_ESP_FLASH_FREQ = 40m
1010
CIRCUITPY_ESP_FLASH_SIZE = 4MB
11-
FLASH_SDKCONFIG = esp-idf-config/sdkconfig-4MB-no-ota.defaults
11+
FLASH_SDKCONFIG = esp-idf-config/sdkconfig-4MB-1ota.defaults
1212

1313
CIRCUITPY_AUDIOBUSIO = 0
1414
CIRCUITPY_CANIO = 0
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# ESP-IDF Partition Table
2+
# Name, Type, SubType, Offset, Size, Flags
3+
# bootloader.bin,, 0x1000, 32K
4+
# partition table, 0x8000, 4K
5+
6+
nvs, data, nvs, 0x9000, 20K,
7+
otadata, data, ota, 0xe000, 8K,
8+
ota_0, app, ota_0, 0x10000, 2816K,
9+
uf2, app, factory,0x2d0000, 256K,
10+
ffat, data, fat, 0x310000, 960K,

ports/espressif/esp-idf-config/partitions-4MB-no-ota.csv

Lines changed: 0 additions & 7 deletions
This file was deleted.

ports/espressif/esp-idf-config/sdkconfig-4MB-no-ota.defaults renamed to ports/espressif/esp-idf-config/sdkconfig-4MB-1ota.defaults

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
1010
CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
1111
# end of Serial flasher config
1212

13-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-no-ota.csv"
13+
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-1ota.csv"
1414
#
1515
# Partition Table
1616
#
17-
CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-ota.csv"
17+
CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-1ota.csv"
1818
# end of Partition Table

ports/espressif/tools/build_memory_info.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ def find_region(start_address):
7373
ota = None
7474
app = None
7575
for partition in csv.reader(f):
76-
if partition[0][0] == "#":
76+
if not partition: # empty row
77+
continue
78+
if partition[0].startswith("#"):
7779
continue
7880
subtype = partition[2].strip()
7981
if subtype == "factory":

0 commit comments

Comments
 (0)