Add <1MB FS options for multi-size boards (#2867)

Boards with selectable flash sizes only had a 1MB FS as the smallest
option on 2MB boards.  For the normal Pico @ 2MB, though, we supported
filesystems down to 64KB.  Add those same options to the 2MB SKUs
of configurable boards.
This commit is contained in:
Earle F. Philhower, III 2025-03-18 16:29:54 -07:00 committed by GitHub
parent 1a8735700f
commit beece2ec9d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 147 additions and 5 deletions

View file

@ -19959,6 +19959,34 @@ akana_r1.menu.flash.2097152_0.build.flash_length=2093056
akana_r1.menu.flash.2097152_0.build.eeprom_start=270528512
akana_r1.menu.flash.2097152_0.build.fs_start=270528512
akana_r1.menu.flash.2097152_0.build.fs_end=270528512
akana_r1.menu.flash.2097152_65536=2MB (Sketch: 1984KB, FS: 64KB)
akana_r1.menu.flash.2097152_65536.upload.maximum_size=2027520
akana_r1.menu.flash.2097152_65536.build.flash_total=2097152
akana_r1.menu.flash.2097152_65536.build.flash_length=2027520
akana_r1.menu.flash.2097152_65536.build.eeprom_start=270528512
akana_r1.menu.flash.2097152_65536.build.fs_start=270462976
akana_r1.menu.flash.2097152_65536.build.fs_end=270528512
akana_r1.menu.flash.2097152_131072=2MB (Sketch: 1920KB, FS: 128KB)
akana_r1.menu.flash.2097152_131072.upload.maximum_size=1961984
akana_r1.menu.flash.2097152_131072.build.flash_total=2097152
akana_r1.menu.flash.2097152_131072.build.flash_length=1961984
akana_r1.menu.flash.2097152_131072.build.eeprom_start=270528512
akana_r1.menu.flash.2097152_131072.build.fs_start=270397440
akana_r1.menu.flash.2097152_131072.build.fs_end=270528512
akana_r1.menu.flash.2097152_262144=2MB (Sketch: 1792KB, FS: 256KB)
akana_r1.menu.flash.2097152_262144.upload.maximum_size=1830912
akana_r1.menu.flash.2097152_262144.build.flash_total=2097152
akana_r1.menu.flash.2097152_262144.build.flash_length=1830912
akana_r1.menu.flash.2097152_262144.build.eeprom_start=270528512
akana_r1.menu.flash.2097152_262144.build.fs_start=270266368
akana_r1.menu.flash.2097152_262144.build.fs_end=270528512
akana_r1.menu.flash.2097152_524288=2MB (Sketch: 1536KB, FS: 512KB)
akana_r1.menu.flash.2097152_524288.upload.maximum_size=1568768
akana_r1.menu.flash.2097152_524288.build.flash_total=2097152
akana_r1.menu.flash.2097152_524288.build.flash_length=1568768
akana_r1.menu.flash.2097152_524288.build.eeprom_start=270528512
akana_r1.menu.flash.2097152_524288.build.fs_start=270004224
akana_r1.menu.flash.2097152_524288.build.fs_end=270528512
akana_r1.menu.flash.2097152_1048576=2MB (Sketch: 1MB, FS: 1MB)
akana_r1.menu.flash.2097152_1048576.upload.maximum_size=1044480
akana_r1.menu.flash.2097152_1048576.build.flash_total=2097152
@ -21224,6 +21252,34 @@ olimex_rp2040pico30.menu.flash.2097152_0.build.flash_length=2093056
olimex_rp2040pico30.menu.flash.2097152_0.build.eeprom_start=270528512
olimex_rp2040pico30.menu.flash.2097152_0.build.fs_start=270528512
olimex_rp2040pico30.menu.flash.2097152_0.build.fs_end=270528512
olimex_rp2040pico30.menu.flash.2097152_65536=2MB (Sketch: 1984KB, FS: 64KB)
olimex_rp2040pico30.menu.flash.2097152_65536.upload.maximum_size=2027520
olimex_rp2040pico30.menu.flash.2097152_65536.build.flash_total=2097152
olimex_rp2040pico30.menu.flash.2097152_65536.build.flash_length=2027520
olimex_rp2040pico30.menu.flash.2097152_65536.build.eeprom_start=270528512
olimex_rp2040pico30.menu.flash.2097152_65536.build.fs_start=270462976
olimex_rp2040pico30.menu.flash.2097152_65536.build.fs_end=270528512
olimex_rp2040pico30.menu.flash.2097152_131072=2MB (Sketch: 1920KB, FS: 128KB)
olimex_rp2040pico30.menu.flash.2097152_131072.upload.maximum_size=1961984
olimex_rp2040pico30.menu.flash.2097152_131072.build.flash_total=2097152
olimex_rp2040pico30.menu.flash.2097152_131072.build.flash_length=1961984
olimex_rp2040pico30.menu.flash.2097152_131072.build.eeprom_start=270528512
olimex_rp2040pico30.menu.flash.2097152_131072.build.fs_start=270397440
olimex_rp2040pico30.menu.flash.2097152_131072.build.fs_end=270528512
olimex_rp2040pico30.menu.flash.2097152_262144=2MB (Sketch: 1792KB, FS: 256KB)
olimex_rp2040pico30.menu.flash.2097152_262144.upload.maximum_size=1830912
olimex_rp2040pico30.menu.flash.2097152_262144.build.flash_total=2097152
olimex_rp2040pico30.menu.flash.2097152_262144.build.flash_length=1830912
olimex_rp2040pico30.menu.flash.2097152_262144.build.eeprom_start=270528512
olimex_rp2040pico30.menu.flash.2097152_262144.build.fs_start=270266368
olimex_rp2040pico30.menu.flash.2097152_262144.build.fs_end=270528512
olimex_rp2040pico30.menu.flash.2097152_524288=2MB (Sketch: 1536KB, FS: 512KB)
olimex_rp2040pico30.menu.flash.2097152_524288.upload.maximum_size=1568768
olimex_rp2040pico30.menu.flash.2097152_524288.build.flash_total=2097152
olimex_rp2040pico30.menu.flash.2097152_524288.build.flash_length=1568768
olimex_rp2040pico30.menu.flash.2097152_524288.build.eeprom_start=270528512
olimex_rp2040pico30.menu.flash.2097152_524288.build.fs_start=270004224
olimex_rp2040pico30.menu.flash.2097152_524288.build.fs_end=270528512
olimex_rp2040pico30.menu.flash.2097152_1048576=2MB (Sketch: 1MB, FS: 1MB)
olimex_rp2040pico30.menu.flash.2097152_1048576.upload.maximum_size=1044480
olimex_rp2040pico30.menu.flash.2097152_1048576.build.flash_total=2097152
@ -30661,6 +30717,34 @@ vccgnd_yd_rp2040.menu.flash.2097152_0.build.flash_length=2093056
vccgnd_yd_rp2040.menu.flash.2097152_0.build.eeprom_start=270528512
vccgnd_yd_rp2040.menu.flash.2097152_0.build.fs_start=270528512
vccgnd_yd_rp2040.menu.flash.2097152_0.build.fs_end=270528512
vccgnd_yd_rp2040.menu.flash.2097152_65536=2MB (Sketch: 1984KB, FS: 64KB)
vccgnd_yd_rp2040.menu.flash.2097152_65536.upload.maximum_size=2027520
vccgnd_yd_rp2040.menu.flash.2097152_65536.build.flash_total=2097152
vccgnd_yd_rp2040.menu.flash.2097152_65536.build.flash_length=2027520
vccgnd_yd_rp2040.menu.flash.2097152_65536.build.eeprom_start=270528512
vccgnd_yd_rp2040.menu.flash.2097152_65536.build.fs_start=270462976
vccgnd_yd_rp2040.menu.flash.2097152_65536.build.fs_end=270528512
vccgnd_yd_rp2040.menu.flash.2097152_131072=2MB (Sketch: 1920KB, FS: 128KB)
vccgnd_yd_rp2040.menu.flash.2097152_131072.upload.maximum_size=1961984
vccgnd_yd_rp2040.menu.flash.2097152_131072.build.flash_total=2097152
vccgnd_yd_rp2040.menu.flash.2097152_131072.build.flash_length=1961984
vccgnd_yd_rp2040.menu.flash.2097152_131072.build.eeprom_start=270528512
vccgnd_yd_rp2040.menu.flash.2097152_131072.build.fs_start=270397440
vccgnd_yd_rp2040.menu.flash.2097152_131072.build.fs_end=270528512
vccgnd_yd_rp2040.menu.flash.2097152_262144=2MB (Sketch: 1792KB, FS: 256KB)
vccgnd_yd_rp2040.menu.flash.2097152_262144.upload.maximum_size=1830912
vccgnd_yd_rp2040.menu.flash.2097152_262144.build.flash_total=2097152
vccgnd_yd_rp2040.menu.flash.2097152_262144.build.flash_length=1830912
vccgnd_yd_rp2040.menu.flash.2097152_262144.build.eeprom_start=270528512
vccgnd_yd_rp2040.menu.flash.2097152_262144.build.fs_start=270266368
vccgnd_yd_rp2040.menu.flash.2097152_262144.build.fs_end=270528512
vccgnd_yd_rp2040.menu.flash.2097152_524288=2MB (Sketch: 1536KB, FS: 512KB)
vccgnd_yd_rp2040.menu.flash.2097152_524288.upload.maximum_size=1568768
vccgnd_yd_rp2040.menu.flash.2097152_524288.build.flash_total=2097152
vccgnd_yd_rp2040.menu.flash.2097152_524288.build.flash_length=1568768
vccgnd_yd_rp2040.menu.flash.2097152_524288.build.eeprom_start=270528512
vccgnd_yd_rp2040.menu.flash.2097152_524288.build.fs_start=270004224
vccgnd_yd_rp2040.menu.flash.2097152_524288.build.fs_end=270528512
vccgnd_yd_rp2040.menu.flash.2097152_1048576=2MB (Sketch: 1MB, FS: 1MB)
vccgnd_yd_rp2040.menu.flash.2097152_1048576.upload.maximum_size=1044480
vccgnd_yd_rp2040.menu.flash.2097152_1048576.build.flash_total=2097152
@ -34799,6 +34883,34 @@ generic.menu.flash.2097152_0.build.flash_length=2093056
generic.menu.flash.2097152_0.build.eeprom_start=270528512
generic.menu.flash.2097152_0.build.fs_start=270528512
generic.menu.flash.2097152_0.build.fs_end=270528512
generic.menu.flash.2097152_65536=2MB (Sketch: 1984KB, FS: 64KB)
generic.menu.flash.2097152_65536.upload.maximum_size=2027520
generic.menu.flash.2097152_65536.build.flash_total=2097152
generic.menu.flash.2097152_65536.build.flash_length=2027520
generic.menu.flash.2097152_65536.build.eeprom_start=270528512
generic.menu.flash.2097152_65536.build.fs_start=270462976
generic.menu.flash.2097152_65536.build.fs_end=270528512
generic.menu.flash.2097152_131072=2MB (Sketch: 1920KB, FS: 128KB)
generic.menu.flash.2097152_131072.upload.maximum_size=1961984
generic.menu.flash.2097152_131072.build.flash_total=2097152
generic.menu.flash.2097152_131072.build.flash_length=1961984
generic.menu.flash.2097152_131072.build.eeprom_start=270528512
generic.menu.flash.2097152_131072.build.fs_start=270397440
generic.menu.flash.2097152_131072.build.fs_end=270528512
generic.menu.flash.2097152_262144=2MB (Sketch: 1792KB, FS: 256KB)
generic.menu.flash.2097152_262144.upload.maximum_size=1830912
generic.menu.flash.2097152_262144.build.flash_total=2097152
generic.menu.flash.2097152_262144.build.flash_length=1830912
generic.menu.flash.2097152_262144.build.eeprom_start=270528512
generic.menu.flash.2097152_262144.build.fs_start=270266368
generic.menu.flash.2097152_262144.build.fs_end=270528512
generic.menu.flash.2097152_524288=2MB (Sketch: 1536KB, FS: 512KB)
generic.menu.flash.2097152_524288.upload.maximum_size=1568768
generic.menu.flash.2097152_524288.build.flash_total=2097152
generic.menu.flash.2097152_524288.build.flash_length=1568768
generic.menu.flash.2097152_524288.build.eeprom_start=270528512
generic.menu.flash.2097152_524288.build.fs_start=270004224
generic.menu.flash.2097152_524288.build.fs_end=270528512
generic.menu.flash.2097152_1048576=2MB (Sketch: 1MB, FS: 1MB)
generic.menu.flash.2097152_1048576.upload.maximum_size=1044480
generic.menu.flash.2097152_1048576.build.flash_total=2097152
@ -35099,6 +35211,34 @@ generic_rp2350.menu.flash.2097152_0.build.flash_length=2088960
generic_rp2350.menu.flash.2097152_0.build.eeprom_start=270524416
generic_rp2350.menu.flash.2097152_0.build.fs_start=270524416
generic_rp2350.menu.flash.2097152_0.build.fs_end=270524416
generic_rp2350.menu.flash.2097152_65536=2MB (Sketch: 1984KB, FS: 64KB)
generic_rp2350.menu.flash.2097152_65536.upload.maximum_size=2023424
generic_rp2350.menu.flash.2097152_65536.build.flash_total=2097152
generic_rp2350.menu.flash.2097152_65536.build.flash_length=2023424
generic_rp2350.menu.flash.2097152_65536.build.eeprom_start=270524416
generic_rp2350.menu.flash.2097152_65536.build.fs_start=270458880
generic_rp2350.menu.flash.2097152_65536.build.fs_end=270524416
generic_rp2350.menu.flash.2097152_131072=2MB (Sketch: 1920KB, FS: 128KB)
generic_rp2350.menu.flash.2097152_131072.upload.maximum_size=1957888
generic_rp2350.menu.flash.2097152_131072.build.flash_total=2097152
generic_rp2350.menu.flash.2097152_131072.build.flash_length=1957888
generic_rp2350.menu.flash.2097152_131072.build.eeprom_start=270524416
generic_rp2350.menu.flash.2097152_131072.build.fs_start=270393344
generic_rp2350.menu.flash.2097152_131072.build.fs_end=270524416
generic_rp2350.menu.flash.2097152_262144=2MB (Sketch: 1792KB, FS: 256KB)
generic_rp2350.menu.flash.2097152_262144.upload.maximum_size=1826816
generic_rp2350.menu.flash.2097152_262144.build.flash_total=2097152
generic_rp2350.menu.flash.2097152_262144.build.flash_length=1826816
generic_rp2350.menu.flash.2097152_262144.build.eeprom_start=270524416
generic_rp2350.menu.flash.2097152_262144.build.fs_start=270262272
generic_rp2350.menu.flash.2097152_262144.build.fs_end=270524416
generic_rp2350.menu.flash.2097152_524288=2MB (Sketch: 1536KB, FS: 512KB)
generic_rp2350.menu.flash.2097152_524288.upload.maximum_size=1564672
generic_rp2350.menu.flash.2097152_524288.build.flash_total=2097152
generic_rp2350.menu.flash.2097152_524288.build.flash_length=1564672
generic_rp2350.menu.flash.2097152_524288.build.eeprom_start=270524416
generic_rp2350.menu.flash.2097152_524288.build.fs_start=270000128
generic_rp2350.menu.flash.2097152_524288.build.fs_end=270524416
generic_rp2350.menu.flash.2097152_1048576=2MB (Sketch: 1MB, FS: 1MB)
generic_rp2350.menu.flash.2097152_1048576.upload.maximum_size=1040384
generic_rp2350.menu.flash.2097152_1048576.build.flash_total=2097152

View file

@ -313,7 +313,8 @@ def BuildWifiType(name):
print("%s.menu.espwifitype.esp_hosted.build.espwifitype=-DESPHOSTSPI=SPI1" % (name))
def MakeBoard(name, chip, vendor_name, product_name, vid, pid, pwr, boarddefine, flashsizemb, psramsize, boot2, extra = None, board_url = None):
fssizelist = [ 0, 64 * 1024, 128 * 1024, 256 * 1024, 512 * 1024 ]
smallfs = [ 0, 64 * 1024, 128 * 1024, 256 * 1024, 512 * 1024 ]
fssizelist = list(smallfs)
for i in range(1, flashsizemb):
fssizelist.append(i * 1024 * 1024)
if chip == "rp2040":
@ -329,19 +330,20 @@ def MakeBoard(name, chip, vendor_name, product_name, vid, pid, pwr, boarddefine,
raise Exception("Unknown board type " + str(chip));
BuildHeader(name, chip, tup, opts, vendor_name, product_name, vid, pid, pwr, boarddefine, name, flashsizemb * 1024 * 1024, psramsize, boot2, extra)
if (name == "generic") or (name == "generic_rp2350") or (name == "vccgnd_yd_rp2040"):
BuildFlashMenu(name, chip, 2*1024*1024, [0, 1*1024*1024])
smfs = [ 0, 64 * 1024, 128 * 1024, 256 * 1024, 512 * 1024 ]
BuildFlashMenu(name, chip, 2*1024*1024, [*smallfs, 1024 * 1024])
BuildFlashMenu(name, chip, 4*1024*1024, [0, 3*1024*1024, 2*1024*1024])
BuildFlashMenu(name, chip, 8*1024*1024, [0, 7*1024*1024, 4*1024*1024, 2*1024*1024])
BuildFlashMenu(name, chip, 16*1024*1024, [0, 15*1024*1024, 14*1024*1024, 12*1024*1024, 8*1024*1024, 4*1024*1024, 2*1024*1024])
elif name == "pimoroni_tiny2040":
BuildFlashMenu(name, chip, 2*1024*1024, fssizelist)
BuildFlashMenu(name, chip, 2*1024*1024, [*smallfs, 1024 * 1024])
BuildFlashMenu(name, chip, 8*1024*1024, [0, 7*1024*1024, 4*1024*1024, 2*1024*1024])
elif name == "akana_r1":
BuildFlashMenu(name, chip, 2*1024*1024, [0, 1*1024*1024])
BuildFlashMenu(name, chip, 2*1024*1024, [*smallfs, 1024 * 1024])
BuildFlashMenu(name, chip, 8*1024*1024, [0, 7*1024*1024, 4*1024*1024, 2*1024*1024])
BuildFlashMenu(name, chip, 16*1024*1024, [0, 15*1024*1024, 14*1024*1024, 12*1024*1024, 8*1024*1024, 4*1024*1024, 2*1024*1024])
elif name == "olimex_rp2040pico30":
BuildFlashMenu(name, chip, 2*1024*1024, [0, 1*1024*1024])
BuildFlashMenu(name, chip, 2*1024*1024, [*smallfs, 1024 * 1024])
BuildFlashMenu(name, chip, 16*1024*1024, [0, 15*1024*1024, 14*1024*1024, 12*1024*1024, 8*1024*1024, 4*1024*1024, 2*1024*1024])
elif (name == "challenger_2350_wifi6_ble5") or (name == "challenger_2040_wifi_ble"):
BuildWifiType(name)