Make SPIFFS be an integer number of blocks #5989
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
boards.txt.py simply calculated the end and start using flash sizes, but in cases where an 8K page was used (>512KB SPIFFS), this could leave a 4K half-block left at the end of SPIFFS. mkspiffs and the SPIFFS code uses integer division to calculate the maximum block number, so it worked fine in practice and the code simply ignored the extra, fractional block. Now actually take block size into account when calculating the end of SPIFFS, ensuring no fractional blocks are passed in. Does not result in data loss on pre-existing SPIFFS filesystems.
d-a-v
reviewed
Apr 16, 2019
Ensure that no SPIFFS_block in the LD files is modified from the original to endure correct backwards compatibility
d-a-v
approved these changes
Apr 16, 2019
|
Could this also be the reason why I was not able to make a working 16M/14M SPIFFS layout with 32k block size? |
|
@TD-er that's pretty unlikely. Everything just integer divides the size which always rounds down, so the extra blocks at the end of space would never be touched or used. This specific change should be a no-op functionally, and only affect the "code aesthetics" by keeping all input values consistent. |
|
@earlephilhower in order to fix conflicts, can you regenerate |
d-a-v
changed the title
earlephilhower
changed the title
|
#6537 will un-breaking this... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3621
boards.txt.py simply calculated SPIFFS end and start using flash sizes, but
in cases where an 8K page was used (>512KB SPIFFS), this could leave a
4K half-block left at the end of SPIFFS.
mkspiffs and the SPIFFS code uses integer division to calculate the
maximum block number, so it worked fine in practice and the code simply
ignored the extra, fractional block.
Now actually take block size into account when calculating the end of
SPIFFS, ensuring no fractional blocks are passed in. Does not result in
data loss on pre-existing SPIFFS filesystems.