8000 inconsistent block size for spiffs in board.txt. and ld files by apicquot · Pull Request #5412 · esp8266/Arduino · GitHub
[go: up one dir, main page]
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 1 commit
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
Prev Previous commit
Next Next commit
block size of 4096 for spiff size < 512 (instead of 1024) 
only impacts boards 2M (SPIFFS 128K) and 2M (SPIFFS 256K)
2M (SPIFFS 512K) remains with 8192 block size
  • Loading branch information
@apicquot
apicquot committed Dec 3, 2018
commit 6f54002bfb4627a4b7b8168f53974a3460d131ac
16 changes: 8 additions & 8 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ generic.menu.eesz.1M512.upload.maximum_size=499696
generic.menu.eesz.1M512.build.rfcal_addr=0xFC000
generic.menu.eesz.1M512.build.spiffs_start=0x7B000
generic.menu.eesz.1M512.build.spiffs_end=0xFB000
generic.menu.eesz.1M512.build.spiffs_blocksize=4096
generic.menu.eesz.1M512.build.spiffs_blocksize=8192
generic.menu.eesz.2M=2M (no SPIFFS)
generic.menu.eesz.2M.build.flash_size=2M
generic.menu.eesz.2M.build.flash_size_bytes=0x200000
Expand Down Expand Up @@ -218,7 +218,7 @@ generic.menu.eesz.2M512.upload.maximum_size=1044464
generic.menu.eesz.2M512.build.rfcal_addr=0x1FC000
generic.menu.eesz.2M512.build.spiffs_start=0x180000
generic.menu.eesz.2M512.build.spiffs_end=0x1FB000
generic.menu.eesz.2M512.build.spiffs_blocksize=4096
generic.menu.eesz.2M512.build.spiffs_blocksize=8192
generic.menu.eesz.2M1M=2M (1M SPIFFS)
generic.menu.eesz.2M1M.build.flash_size=2M
generic.menu.eesz.2M1M.build.flash_size_bytes=0x200000
Expand Down Expand Up @@ -564,7 +564,7 @@ esp8285.menu.eesz.1M512.upload.maximum_size=499696
esp8285.menu.eesz.1M512.build.rfcal_addr=0xFC000
esp8285.menu.eesz.1M512.build.spiffs_start=0x7B000
esp8285.menu.eesz.1M512.build.spiffs_end=0xFB000
esp8285.menu.eesz.1M512.build.spiffs_blocksize=4096
esp8285.menu.eesz.1M512.build.spiffs_blocksize=8192
esp8285.menu.led.2=2
esp8285.menu.led.2.build.led=-DLED_BUILTIN=2
esp8285.menu.led.0=0
Expand Down Expand Up @@ -2566,7 +2566,7 @@ modwifi.menu.eesz.2M512.upload.maximum_size=1044464
modwifi.menu.eesz.2M512.build.rfcal_addr=0x1FC000
modwifi.menu.eesz.2M512.build.spiffs_start=0x180000
modwifi.menu.eesz.2M512.build.spiffs_end=0x1FB000
modwifi.menu.eesz.2M512.build.spiffs_blocksize=4096
modwifi.menu.eesz.2M512.build.spiffs_blocksize=8192
modwifi.menu.eesz.2M1M=2M (1M SPIFFS)
modwifi.menu.eesz.2M1M.build.flash_size=2M
modwifi.menu.eesz.2M1M.build.flash_size_bytes=0x200000
Expand Down Expand Up @@ -3661,7 +3661,7 @@ d1_mini_lite.menu.eesz.1M512.upload.maximum_size=499696
d1_mini_lite.menu.eesz.1M512.build.rfcal_addr=0xFC000
d1_mini_lite.menu.eesz.1M512.build.spiffs_start=0x7B000
d1_mini_lite.menu.eesz.1M512.build.spiffs_end=0xFB000
d1_mini_lite.menu.eesz.1M512.build.spiffs_blocksize=4096
d1_mini_lite.menu.eesz.1M512.build.spiffs_blocksize=8192
d1_mini_lite.menu.ip.lm2f=v2 Lower Memory
d1_mini_lite.menu.ip.lm2f.build.lwip_include=lwip2/include
d1_mini_lite.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
Expand Down Expand Up @@ -4432,7 +4432,7 @@ wifinfo.menu.eesz.1M512.upload.maximum_size=499696
wifinfo.menu.eesz.1M512.build.rfcal_addr=0xFC000
wifinfo.menu.eesz.1M512.build.spiffs_start=0x7B000
wifinfo.menu.eesz.1M512.build.spiffs_end=0xFB000
wifinfo.menu.eesz.1M512.build.spiffs_blocksize=4096
wifinfo.menu.eesz.1M512.build.spiffs_blocksize=8192
wifinfo.menu.ip.lm2f=v2 Lower Memory
wifinfo.menu.ip.lm2f.build.lwip_include=lwip2/include
wifinfo.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
Expand Down Expand Up @@ -5381,7 +5381,7 @@ wifi_slot.menu.eesz.1M512.upload.maximum_size=499696
wifi_slot.menu.eesz.1M512.build.rfcal_addr=0xFC000
wifi_slot.menu.eesz.1M512.build.spiffs_start=0x7B000
wifi_slot.menu.eesz.1M512.build.spiffs_end=0xFB000
wifi_slot.menu.eesz.1M512.build.spiffs_blocksize=4096
wifi_slot.menu.eesz.1M512.build.spiffs_blocksize=8192
wifi_slot.menu.eesz.2M=2M (no SPIFFS)
wifi_slot.menu.eesz.2M.build.flash_size=2M
wifi_slot.menu.eesz.2M.build.flash_size_bytes=0x200000
Expand Down Expand Up @@ -5418,7 +5418,7 @@ wifi_slot.menu.eesz.2M512.upload.maximum_size=1044464
wifi_slot.menu.eesz.2M512.build.rfcal_addr=0x1FC000
wifi_slot.menu.eesz.2M512.build.spiffs_start=0x180000
wifi_slot.menu.eesz.2M512.build.spiffs_end=0x1FB000
wifi_slot.menu.eesz.2M512.build.spiffs_blocksize=4096
wifi_slot.menu.eesz.2M512.build.spiffs_blocksize=8192
wifi_slot.menu.eesz.2M1M=2M (1M SPIFFS)
wifi_slot.menu.eesz.2M1M.build.flash_size=2M
wifi_slot.menu.eesz.2M1M.build.flash_size_bytes=0x200000
Expand Down
2 changes: 1 addition & 1 deletion tools/boards.txt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,7 @@ def flash_map (flashsize_kb, spiffs_kb = 0):
max_upload_size = 1024 * 1024 - reserved
spiffs_start = (flashsize_kb - spiffs_kb) * 1024

if spiffs_kb < 1024:
if spiffs_kb < 512:
spiffs_blocksize = 4096
else:
spiffs_blocksize = 8192
Expand Down
0