Skip to content

inconsistent block size for spiffs in board.txt. and ld files #5412

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.

Sign up for GitHub

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 15 commits into from
Dec 4, 2018
Merged

inconsistent block size for spiffs in board.txt. and ld files #5412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
12365ea
block size for board.txt now depends on spiffs size not flash size to…
apicquot Dec 2, 2018
55ef182
Merge branch 'master' into fixing_inconsistent_spiffs_blocksize
apicquot Dec 3, 2018
6f54002
block size of 4096 for spiff size < 512 (instead of 1024)
apicquot Dec 3, 2018
41459e1
Merge branch 'fixing_inconsistent_spiffs_blocksize' of https://github…
apicquot Dec 3, 2018
db681a4
Merge branch 'master' into fixing_inconsistent_spiffs_blocksize
apicquot Dec 3, 2018
bbaf6d9
block size of 4096 for all boads of flash size <= 1024
apicquot Dec 3, 2018
59894c4
Merge branch 'fixing_inconsistent_spiffs_blocksize' of https://github…
apicquot Dec 3, 2018
5510e88
indent error
apicquot Dec 3, 2018
b64987c
indent issue
apicquot Dec 4, 2018
5d19803
indent issue
apicquot Dec 4, 2018
2739c1f
indent issue
apicquot Dec 4, 2018
8ad359d
indent issue
apicquot Dec 4, 2018
2403063
indent issue
apicquot Dec 4, 2018
f50df4e
keep indent issue
apicquot Dec 4, 2018
67098eb
Merge branch 'master' into fixing_inconsistent_spiffs_blocksize
earlephilhower Dec 4, 2018
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
12 changes: 6 additions & 6 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ generic.menu.eesz.2M128.upload.maximum_size=1044464
generic.menu.eesz.2M128.build.rfcal_addr=0x1FC000
generic.menu.eesz.2M128.build.spiffs_start=0x1E0000
generic.menu.eesz.2M128.build.spiffs_end=0x1FB000
generic.menu.eesz.2M128.build.spiffs_blocksize=8192
generic.menu.eesz.2M128.build.spiffs_blocksize=4096
generic.menu.eesz.2M256=2M (256K SPIFFS)
generic.menu.eesz.2M256.build.flash_size=2M
generic.menu.eesz.2M256.build.flash_size_bytes=0x200000
Expand All @@ -208,7 +208,7 @@ generic.menu.eesz.2M256.upload.maximum_size=1044464
generic.menu.eesz.2M256.build.rfcal_addr=0x1FC000
generic.menu.eesz.2M256.build.spiffs_start=0x1C0000
generic.menu.eesz.2M256.build.spiffs_end=0x1FB000
generic.menu.eesz.2M256.build.spiffs_blocksize=8192
generic.menu.eesz.2M256.build.spiffs_blocksize=4096
generic.menu.eesz.2M512=2M (512K SPIFFS)
generic.menu.eesz.2M512.build.flash_size=2M
generic.menu.eesz.2M512.build.flash_size_bytes=0x200000
Expand Down Expand Up @@ -2546,7 +2546,7 @@ modwifi.menu.eesz.2M128.upload.maximum_size=1044464
modwifi.menu.eesz.2M128.build.rfcal_addr=0x1FC000
modwifi.menu.eesz.2M128.build.spiffs_start=0x1E0000
modwifi.menu.eesz.2M128.build.spiffs_end=0x1FB000
modwifi.menu.eesz.2M128.build.spiffs_blocksize=8192
modwifi.menu.eesz.2M128.build.spiffs_blocksize=4096
modwifi.menu.eesz.2M256=2M (256K SPIFFS)
modwifi.menu.eesz.2M256.build.flash_size=2M
modwifi.menu.eesz.2M256.build.flash_size_bytes=0x200000
Expand All @@ -2556,7 +2556,7 @@ modwifi.menu.eesz.2M256.upload.maximum_size=1044464
modwifi.menu.eesz.2M256.build.rfcal_addr=0x1FC000
modwifi.menu.eesz.2M256.build.spiffs_start=0x1C0000
modwifi.menu.eesz.2M256.build.spiffs_end=0x1FB000
modwifi.menu.eesz.2M256.build.spiffs_blocksize=8192
modwifi.menu.eesz.2M256.build.spiffs_blocksize=4096
modwifi.menu.eesz.2M512=2M (512K SPIFFS)
modwifi.menu.eesz.2M512.build.flash_size=2M
modwifi.menu.eesz.2M512.build.flash_size_bytes=0x200000
Expand Down Expand Up @@ -5398,7 +5398,7 @@ wifi_slot.menu.eesz.2M128.upload.maximum_size=1044464
wifi_slot.menu.eesz.2M128.build.rfcal_addr=0x1FC000
wifi_slot.menu.eesz.2M128.build.spiffs_start=0x1E0000
wifi_slot.menu.eesz.2M128.build.spiffs_end=0x1FB000
wifi_slot.menu.eesz.2M128.build.spiffs_blocksize=8192
wifi_slot.menu.eesz.2M128.build.spiffs_blocksize=4096
wifi_slot.menu.eesz.2M256=2M (256K SPIFFS)
wifi_slot.menu.eesz.2M256.build.flash_size=2M
wifi_slot.menu.eesz.2M256.build.flash_size_bytes=0x200000
Expand All @@ -5408,7 +5408,7 @@ wifi_slot.menu.eesz.2M256.upload.maximum_size=1044464
wifi_slot.menu.eesz.2M256.build.rfcal_addr=0x1FC000
wifi_slot.menu.eesz.2M256.build.spiffs_start=0x1C0000
wifi_slot.menu.eesz.2M256.build.spiffs_end=0x1FB000
wifi_slot.menu.eesz.2M256.build.spiffs_blocksize=8192
wifi_slot.menu.eesz.2M256.build.spiffs_blocksize=4096
wifi_slot.menu.eesz.2M512=2M (512K SPIFFS)
wifi_slot.menu.eesz.2M512.build.flash_size=2M
wifi_slot.menu.eesz.2M512.build.flash_size_bytes=0x200000
Expand Down
182 changes: 91 additions & 91 deletions package/package_esp8266com_index.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,97 +15,97 @@
"architecture": "esp8266",
"archiveFileName": "",
"boards": [
{
"name": "Generic ESP8266 Module"
},
{
"name": "Generic ESP8285 Module"
},
{
"name": "ESPDuino (ESP-13 Module)"
},
{
"name": "Adafruit Feather HUZZAH ESP8266"
},
{
"name": "Invent One"
},
{
"name": "XinaBox CW01"
},
{
"name": "ESPresso Lite 1.0"
},
{
"name": "ESPresso Lite 2.0"
},
{
"name": "Phoenix 1.0"
},
{
"name": "Phoenix 2.0"
},
{
"name": "NodeMCU 0.9 (ESP-12 Module)"
},
{
"name": "NodeMCU 1.0 (ESP-12E Module)"
},
{
"name": "Olimex MOD-WIFI-ESP8266(-DEV)"
},
{
"name": "SparkFun ESP8266 Thing"
},
{
"name": "SparkFun ESP8266 Thing Dev"
},
{
"name": "SweetPea ESP-210"
},
{
"name": "LOLIN(WEMOS) D1 R2 & mini"
},
{
"name": "LOLIN(WEMOS) D1 mini Pro"
},
{
"name": "LOLIN(WEMOS) D1 mini Lite"
},
{
"name": "WeMos D1 R1"
},
{
"name": "ESPino (ESP-12 Module)"
},
{
"name": "ThaiEasyElec's ESPino"
},
{
"name": "WifInfo"
},
{
"name": "Arduino"
},
{
"name": "4D Systems gen4 IoD Range"
},
{
"name": "Digistump Oak"
},
{
"name": "WiFiduino"
},
{
"name": "Amperka WiFi Slot"
},
{
"name": "Seeed Wio Link"
},
{
"name": "ESPectro Core"
}
],
{
"name": "Generic ESP8266 Module"
},
{
"name": "Generic ESP8285 Module"
},
{
"name": "ESPDuino (ESP-13 Module)"
},
{
"name": "Adafruit Feather HUZZAH ESP8266"
},
{
"name": "Invent One"
},
{
"name": "XinaBox CW01"
},
{
"name": "ESPresso Lite 1.0"
},
{
"name": "ESPresso Lite 2.0"
},
{
"name": "Phoenix 1.0"
},
{
"name": "Phoenix 2.0"
},
{
"name": "NodeMCU 0.9 (ESP-12 Module)"
},
{
"name": "NodeMCU 1.0 (ESP-12E Module)"
},
{
"name": "Olimex MOD-WIFI-ESP8266(-DEV)"
},
{
"name": "SparkFun ESP8266 Thing"
},
{
"name": "SparkFun ESP8266 Thing Dev"
},
{
"name": "SweetPea ESP-210"
},
{
"name": "LOLIN(WEMOS) D1 R2 & mini"
},
{
"name": "LOLIN(WEMOS) D1 mini Pro"
},
{
"name": "LOLIN(WEMOS) D1 mini Lite"
},
{
"name": "WeMos D1 R1"
},
{
"name": "ESPino (ESP-12 Module)"
},
{
"name": "ThaiEasyElec's ESPino"
},
{
"name": "WifInfo"
},
{
"name": "Arduino"
},
{
"name": "4D Systems gen4 IoD Range"
},
{
"name": "Digistump Oak"
},
{
"name": "WiFiduino"
},
{
"name": "Amperka WiFi Slot"
},
{
"name": "Seeed Wio Link"
},
{
"name": "ESPectro Core"
}
],
"toolsDependencies": [
{
"packager": "esp8266",
Expand Down
5 changes: 4 additions & 1 deletion tools/boards.txt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,7 +1154,10 @@ def flash_map (flashsize_kb, spiffs_kb = 0):
else:
max_upload_size = 1024 * 1024 - reserved
spiffs_start = (flashsize_kb - spiffs_kb) * 1024
spiffs_blocksize = 8192
if spiffs_kb < 512:
spiffs_blocksize = 4096
else:
spiffs_blocksize = 8192

strsize = str(flashsize_kb / 1024) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K'
strspiffs = str(spiffs_kb / 1024) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) + 'K'
Expand Down