Skip to content

Commit beece2e

Browse files
earlephilhowerearlephilhower
authored
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.
1 parent 1a87357 commit beece2e

File tree

2 files changed

+147
-5
lines changed

2 files changed

+147
-5
lines changed

‎boards.txt‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19959,6 +19959,34 @@ akana_r1.menu.flash.2097152_0.build.flash_length=2093056
1995919959
akana_r1.menu.flash.2097152_0.build.eeprom_start=270528512
1996019960
akana_r1.menu.flash.2097152_0.build.fs_start=270528512
1996119961
akana_r1.menu.flash.2097152_0.build.fs_end=270528512
19962+
akana_r1.menu.flash.2097152_65536=2MB (Sketch: 1984KB, FS: 64KB)
19963+
akana_r1.menu.flash.2097152_65536.upload.maximum_size=2027520
19964+
akana_r1.menu.flash.2097152_65536.build.flash_total=2097152
19965+
akana_r1.menu.flash.2097152_65536.build.flash_length=2027520
19966+
akana_r1.menu.flash.2097152_65536.build.eeprom_start=270528512
19967+
akana_r1.menu.flash.2097152_65536.build.fs_start=270462976
19968+
akana_r1.menu.flash.2097152_65536.build.fs_end=270528512
19969+
akana_r1.menu.flash.2097152_131072=2MB (Sketch: 1920KB, FS: 128KB)
19970+
akana_r1.menu.flash.2097152_131072.upload.maximum_size=1961984
19971+
akana_r1.menu.flash.2097152_131072.build.flash_total=2097152
19972+
akana_r1.menu.flash.2097152_131072.build.flash_length=1961984
19973+
akana_r1.menu.flash.2097152_131072.build.eeprom_start=270528512
19974+
akana_r1.menu.flash.2097152_131072.build.fs_start=270397440
19975+
akana_r1.menu.flash.2097152_131072.build.fs_end=270528512
19976+
akana_r1.menu.flash.2097152_262144=2MB (Sketch: 1792KB, FS: 256KB)
19977+
akana_r1.menu.flash.2097152_262144.upload.maximum_size=1830912
19978+
akana_r1.menu.flash.2097152_262144.build.flash_total=2097152
19979+
akana_r1.menu.flash.2097152_262144.build.flash_length=1830912
19980+
akana_r1.menu.flash.2097152_262144.build.eeprom_start=270528512
19981+
akana_r1.menu.flash.2097152_262144.build.fs_start=270266368
19982+
akana_r1.menu.flash.2097152_262144.build.fs_end=270528512
19983+
akana_r1.menu.flash.2097152_524288=2MB (Sketch: 1536KB, FS: 512KB)
19984+
akana_r1.menu.flash.2097152_524288.upload.maximum_size=1568768
19985+
akana_r1.menu.flash.2097152_524288.build.flash_total=2097152
19986+
akana_r1.menu.flash.2097152_524288.build.flash_length=1568768
19987+
akana_r1.menu.flash.2097152_524288.build.eeprom_start=270528512
19988+
akana_r1.menu.flash.2097152_524288.build.fs_start=270004224
19989+
akana_r1.menu.flash.2097152_524288.build.fs_end=270528512
1996219990
akana_r1.menu.flash.2097152_1048576=2MB (Sketch: 1MB, FS: 1MB)
1996319991
akana_r1.menu.flash.2097152_1048576.upload.maximum_size=1044480
1996419992
akana_r1.menu.flash.2097152_1048576.build.flash_total=2097152
@@ -21224,6 +21252,34 @@ olimex_rp2040pico30.menu.flash.2097152_0.build.flash_length=2093056
2122421252
olimex_rp2040pico30.menu.flash.2097152_0.build.eeprom_start=270528512
2122521253
olimex_rp2040pico30.menu.flash.2097152_0.build.fs_start=270528512
2122621254
olimex_rp2040pico30.menu.flash.2097152_0.build.fs_end=270528512
21255+
olimex_rp2040pico30.menu.flash.2097152_65536=2MB (Sketch: 1984KB, FS: 64KB)
21256+
olimex_rp2040pico30.menu.flash.2097152_65536.upload.maximum_size=2027520
21257+
olimex_rp2040pico30.menu.flash.2097152_65536.build.flash_total=2097152
21258+
olimex_rp2040pico30.menu.flash.2097152_65536.build.flash_length=2027520
21259+
olimex_rp2040pico30.menu.flash.2097152_65536.build.eeprom_start=270528512
21260+
olimex_rp2040pico30.menu.flash.2097152_65536.build.fs_start=270462976
21261+
olimex_rp2040pico30.menu.flash.2097152_65536.build.fs_end=270528512
21262+
olimex_rp2040pico30.menu.flash.2097152_131072=2MB (Sketch: 1920KB, FS: 128KB)
21263+
olimex_rp2040pico30.menu.flash.2097152_131072.upload.maximum_size=1961984
21264+
olimex_rp2040pico30.menu.flash.2097152_131072.build.flash_total=2097152
21265+
olimex_rp2040pico30.menu.flash.2097152_131072.build.flash_length=1961984
21266+
olimex_rp2040pico30.menu.flash.2097152_131072.build.eeprom_start=270528512
21267+
olimex_rp2040pico30.menu.flash.2097152_131072.build.fs_start=270397440
21268+
olimex_rp2040pico30.menu.flash.2097152_131072.build.fs_end=270528512
21269+
olimex_rp2040pico30.menu.flash.2097152_262144=2MB (Sketch: 1792KB, FS: 256KB)
21270+
olimex_rp2040pico30.menu.flash.2097152_262144.upload.maximum_size=1830912
21271+
olimex_rp2040pico30.menu.flash.2097152_262144.build.flash_total=2097152
21272+
olimex_rp2040pico30.menu.flash.2097152_262144.build.flash_length=1830912
21273+
olimex_rp2040pico30.menu.flash.2097152_262144.build.eeprom_start=270528512
21274+
olimex_rp2040pico30.menu.flash.2097152_262144.build.fs_start=270266368
21275+
olimex_rp2040pico30.menu.flash.2097152_262144.build.fs_end=270528512
21276+
olimex_rp2040pico30.menu.flash.2097152_524288=2MB (Sketch: 1536KB, FS: 512KB)
21277+
olimex_rp2040pico30.menu.flash.2097152_524288.upload.maximum_size=1568768
21278+
olimex_rp2040pico30.menu.flash.2097152_524288.build.flash_total=2097152
21279+
olimex_rp2040pico30.menu.flash.2097152_524288.build.flash_length=1568768
21280+
olimex_rp2040pico30.menu.flash.2097152_524288.build.eeprom_start=270528512
21281+
olimex_rp2040pico30.menu.flash.2097152_524288.build.fs_start=270004224
21282+
olimex_rp2040pico30.menu.flash.2097152_524288.build.fs_end=270528512
2122721283
olimex_rp2040pico30.menu.flash.2097152_1048576=2MB (Sketch: 1MB, FS: 1MB)
2122821284
olimex_rp2040pico30.menu.flash.2097152_1048576.upload.maximum_size=1044480
2122921285
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
3066130717
vccgnd_yd_rp2040.menu.flash.2097152_0.build.eeprom_start=270528512
3066230718
vccgnd_yd_rp2040.menu.flash.2097152_0.build.fs_start=270528512
3066330719
vccgnd_yd_rp2040.menu.flash.2097152_0.build.fs_end=270528512
30720+
vccgnd_yd_rp2040.menu.flash.2097152_65536=2MB (Sketch: 1984KB, FS: 64KB)
30721+
vccgnd_yd_rp2040.menu.flash.2097152_65536.upload.maximum_size=2027520
30722+
vccgnd_yd_rp2040.menu.flash.2097152_65536.build.flash_total=2097152
30723+
vccgnd_yd_rp2040.menu.flash.2097152_65536.build.flash_length=2027520
30724+
vccgnd_yd_rp2040.menu.flash.2097152_65536.build.eeprom_start=270528512
30725+
vccgnd_yd_rp2040.menu.flash.2097152_65536.build.fs_start=270462976
30726+
vccgnd_yd_rp2040.menu.flash.2097152_65536.build.fs_end=270528512
30727+
vccgnd_yd_rp2040.menu.flash.2097152_131072=2MB (Sketch: 1920KB, FS: 128KB)
30728+
vccgnd_yd_rp2040.menu.flash.2097152_131072.upload.maximum_size=1961984
30729+
vccgnd_yd_rp2040.menu.flash.2097152_131072.build.flash_total=2097152
30730+
vccgnd_yd_rp2040.menu.flash.2097152_131072.build.flash_length=1961984
30731+
vccgnd_yd_rp2040.menu.flash.2097152_131072.build.eeprom_start=270528512
30732+
vccgnd_yd_rp2040.menu.flash.2097152_131072.build.fs_start=270397440
30733+
vccgnd_yd_rp2040.menu.flash.2097152_131072.build.fs_end=270528512
30734+
vccgnd_yd_rp2040.menu.flash.2097152_262144=2MB (Sketch: 1792KB, FS: 256KB)
30735+
vccgnd_yd_rp2040.menu.flash.2097152_262144.upload.maximum_size=1830912
30736+
vccgnd_yd_rp2040.menu.flash.2097152_262144.build.flash_total=2097152
30737+
vccgnd_yd_rp2040.menu.flash.2097152_262144.build.flash_length=1830912
30738+
vccgnd_yd_rp2040.menu.flash.2097152_262144.build.eeprom_start=270528512
30739+
vccgnd_yd_rp2040.menu.flash.2097152_262144.build.fs_start=270266368
30740+
vccgnd_yd_rp2040.menu.flash.2097152_262144.build.fs_end=270528512
30741+
vccgnd_yd_rp2040.menu.flash.2097152_524288=2MB (Sketch: 1536KB, FS: 512KB)
30742+
vccgnd_yd_rp2040.menu.flash.2097152_524288.upload.maximum_size=1568768
30743+
vccgnd_yd_rp2040.menu.flash.2097152_524288.build.flash_total=2097152
30744+
vccgnd_yd_rp2040.menu.flash.2097152_524288.build.flash_length=1568768
30745+
vccgnd_yd_rp2040.menu.flash.2097152_524288.build.eeprom_start=270528512
30746+
vccgnd_yd_rp2040.menu.flash.2097152_524288.build.fs_start=270004224
30747+
vccgnd_yd_rp2040.menu.flash.2097152_524288.build.fs_end=270528512
3066430748
vccgnd_yd_rp2040.menu.flash.2097152_1048576=2MB (Sketch: 1MB, FS: 1MB)
3066530749
vccgnd_yd_rp2040.menu.flash.2097152_1048576.upload.maximum_size=1044480
3066630750
vccgnd_yd_rp2040.menu.flash.2097152_1048576.build.flash_total=2097152
@@ -34799,6 +34883,34 @@ generic.menu.flash.2097152_0.build.flash_length=2093056
3479934883
generic.menu.flash.2097152_0.build.eeprom_start=270528512
3480034884
generic.menu.flash.2097152_0.build.fs_start=270528512
3480134885
generic.menu.flash.2097152_0.build.fs_end=270528512
34886+
generic.menu.flash.2097152_65536=2MB (Sketch: 1984KB, FS: 64KB)
34887+
generic.menu.flash.2097152_65536.upload.maximum_size=2027520
34888+
generic.menu.flash.2097152_65536.build.flash_total=2097152
34889+
generic.menu.flash.2097152_65536.build.flash_length=2027520
34890+
generic.menu.flash.2097152_65536.build.eeprom_start=270528512
34891+
generic.menu.flash.2097152_65536.build.fs_start=270462976
34892+
generic.menu.flash.2097152_65536.build.fs_end=270528512
34893+
generic.menu.flash.2097152_131072=2MB (Sketch: 1920KB, FS: 128KB)
34894+
generic.menu.flash.2097152_131072.upload.maximum_size=1961984
34895+
generic.menu.flash.2097152_131072.build.flash_total=2097152
34896+
generic.menu.flash.2097152_131072.build.flash_length=1961984
34897+
generic.menu.flash.2097152_131072.build.eeprom_start=270528512
34898+
generic.menu.flash.2097152_131072.build.fs_start=270397440
34899+
generic.menu.flash.2097152_131072.build.fs_end=270528512
34900+
generic.menu.flash.2097152_262144=2MB (Sketch: 1792KB, FS: 256KB)
34901+
generic.menu.flash.2097152_262144.upload.maximum_size=1830912
34902+
generic.menu.flash.2097152_262144.build.flash_total=2097152
34903+
generic.menu.flash.2097152_262144.build.flash_length=1830912
34904+
generic.menu.flash.2097152_262144.build.eeprom_start=270528512
34905+
generic.menu.flash.2097152_262144.build.fs_start=270266368
34906+
generic.menu.flash.2097152_262144.build.fs_end=270528512
34907+
generic.menu.flash.2097152_524288=2MB (Sketch: 1536KB, FS: 512KB)
34908+
generic.menu.flash.2097152_524288.upload.maximum_size=1568768
34909+
generic.menu.flash.2097152_524288.build.flash_total=2097152
34910+
generic.menu.flash.2097152_524288.build.flash_length=1568768
34911+
generic.menu.flash.2097152_524288.build.eeprom_start=270528512
34912+
generic.menu.flash.2097152_524288.build.fs_start=270004224
34913+
generic.menu.flash.2097152_524288.build.fs_end=270528512
3480234914
generic.menu.flash.2097152_1048576=2MB (Sketch: 1MB, FS: 1MB)
3480334915
generic.menu.flash.2097152_1048576.upload.maximum_size=1044480
3480434916
generic.menu.flash.2097152_1048576.build.flash_total=2097152
@@ -35099,6 +35211,34 @@ generic_rp2350.menu.flash.2097152_0.build.flash_length=2088960
3509935211
generic_rp2350.menu.flash.2097152_0.build.eeprom_start=270524416
3510035212
generic_rp2350.menu.flash.2097152_0.build.fs_start=270524416
3510135213
generic_rp2350.menu.flash.2097152_0.build.fs_end=270524416
35214+
generic_rp2350.menu.flash.2097152_65536=2MB (Sketch: 1984KB, FS: 64KB)
35215+
generic_rp2350.menu.flash.2097152_65536.upload.maximum_size=2023424
35216+
generic_rp2350.menu.flash.2097152_65536.build.flash_total=2097152
35217+
generic_rp2350.menu.flash.2097152_65536.build.flash_length=2023424
35218+
generic_rp2350.menu.flash.2097152_65536.build.eeprom_start=270524416
35219+
generic_rp2350.menu.flash.2097152_65536.build.fs_start=270458880
35220+
generic_rp2350.menu.flash.2097152_65536.build.fs_end=270524416
35221+
generic_rp2350.menu.flash.2097152_131072=2MB (Sketch: 1920KB, FS: 128KB)
35222+
generic_rp2350.menu.flash.2097152_131072.upload.maximum_size=1957888
35223+
generic_rp2350.menu.flash.2097152_131072.build.flash_total=2097152
35224+
generic_rp2350.menu.flash.2097152_131072.build.flash_length=1957888
35225+
generic_rp2350.menu.flash.2097152_131072.build.eeprom_start=270524416
35226+
generic_rp2350.menu.flash.2097152_131072.build.fs_start=270393344
35227+
generic_rp2350.menu.flash.2097152_131072.build.fs_end=270524416
35228+
generic_rp2350.menu.flash.2097152_262144=2MB (Sketch: 1792KB, FS: 256KB)
35229+
generic_rp2350.menu.flash.2097152_262144.upload.maximum_size=1826816
35230+
generic_rp2350.menu.flash.2097152_262144.build.flash_total=2097152
35231+
generic_rp2350.menu.flash.2097152_262144.build.flash_length=1826816
35232+
generic_rp2350.menu.flash.2097152_262144.build.eeprom_start=270524416
35233+
generic_rp2350.menu.flash.2097152_262144.build.fs_start=270262272
35234+
generic_rp2350.menu.flash.2097152_262144.build.fs_end=270524416
35235+
generic_rp2350.menu.flash.2097152_524288=2MB (Sketch: 1536KB, FS: 512KB)
35236+
generic_rp2350.menu.flash.2097152_524288.upload.maximum_size=1564672
35237+
generic_rp2350.menu.flash.2097152_524288.build.flash_total=2097152
35238+
generic_rp2350.menu.flash.2097152_524288.build.flash_length=1564672
35239+
generic_rp2350.menu.flash.2097152_524288.build.eeprom_start=270524416
35240+
generic_rp2350.menu.flash.2097152_524288.build.fs_start=270000128
35241+
generic_rp2350.menu.flash.2097152_524288.build.fs_end=270524416
3510235242
generic_rp2350.menu.flash.2097152_1048576=2MB (Sketch: 1MB, FS: 1MB)
3510335243
generic_rp2350.menu.flash.2097152_1048576.upload.maximum_size=1040384
3510435244
generic_rp2350.menu.flash.2097152_1048576.build.flash_total=2097152

‎tools/makeboards.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,8 @@ def BuildWifiType(name):
313313
print("%s.menu.espwifitype.esp_hosted.build.espwifitype=-DESPHOSTSPI=SPI1" % (name))
314314

315315
def MakeBoard(name, chip, vendor_name, product_name, vid, pid, pwr, boarddefine, flashsizemb, psramsize, boot2, extra = None, board_url = None):
316-
fssizelist = [ 0, 64 * 1024, 128 * 1024, 256 * 1024, 512 * 1024 ]
316+
smallfs = [ 0, 64 * 1024, 128 * 1024, 256 * 1024, 512 * 1024 ]
317+
fssizelist = list(smallfs)
317318
for i in range(1, flashsizemb):
318319
fssizelist.append(i * 1024 * 1024)
319320
if chip == "rp2040":
@@ -329,19 +330,20 @@ def MakeBoard(name, chip, vendor_name, product_name, vid, pid, pwr, boarddefine,
329330
raise Exception("Unknown board type " + str(chip));
330331
BuildHeader(name, chip, tup, opts, vendor_name, product_name, vid, pid, pwr, boarddefine, name, flashsizemb * 1024 * 1024, psramsize, boot2, extra)
331332
if (name == "generic") or (name == "generic_rp2350") or (name == "vccgnd_yd_rp2040"):
332-
BuildFlashMenu(name, chip, 2*1024*1024, [0, 1*1024*1024])
333+
smfs = [ 0, 64 * 1024, 128 * 1024, 256 * 1024, 512 * 1024 ]
334+
BuildFlashMenu(name, chip, 2*1024*1024, [*smallfs, 1024 * 1024])
333335
BuildFlashMenu(name, chip, 4*1024*1024, [0, 3*1024*1024, 2*1024*1024])
334336
BuildFlashMenu(name, chip, 8*1024*1024, [0, 7*1024*1024, 4*1024*1024, 2*1024*1024])
335337
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])
336338
elif name == "pimoroni_tiny2040":
337-
BuildFlashMenu(name, chip, 2*1024*1024, fssizelist)
339+
BuildFlashMenu(name, chip, 2*1024*1024, [*smallfs, 1024 * 1024])
338340
BuildFlashMenu(name, chip, 8*1024*1024, [0, 7*1024*1024, 4*1024*1024, 2*1024*1024])
339341
elif name == "akana_r1":
340-
BuildFlashMenu(name, chip, 2*1024*1024, [0, 1*1024*1024])
342+
BuildFlashMenu(name, chip, 2*1024*1024, [*smallfs, 1024 * 1024])
341343
BuildFlashMenu(name, chip, 8*1024*1024, [0, 7*1024*1024, 4*1024*1024, 2*1024*1024])
342344
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])
343345
elif name == "olimex_rp2040pico30":
344-
BuildFlashMenu(name, chip, 2*1024*1024, [0, 1*1024*1024])
346+
BuildFlashMenu(name, chip, 2*1024*1024, [*smallfs, 1024 * 1024])
345347
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])
346348
elif (name == "challenger_2350_wifi6_ble5") or (name == "challenger_2040_wifi_ble"):
347349
BuildWifiType(name)

0 commit comments

Comments
 (0)