Revert "cpu/esp8266: update deprecated flash_size argument"#12252
Merged
benpicco merged 1 commit intoRIOT-OS:masterfrom Sep 16, 2019
Merged
Revert "cpu/esp8266: update deprecated flash_size argument"#12252benpicco merged 1 commit intoRIOT-OS:masterfrom
benpicco merged 1 commit intoRIOT-OS:masterfrom
Conversation
This reverts commit 422644b. The option is only supported after 2.6 which is currently not the version given with 'esp' toolchain. It was a bit too early to switch to the new version. Version 2.7 also supports the old option with only a warning.
benpicco
approved these changes
Sep 16, 2019
Contributor
benpicco
left a comment
There was a problem hiding this comment.
I can confirm that with this change, flashing is working again with the esptool that's coming with the toolchain.
Contributor
Author
|
Thank you for the review. |
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
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.
Contribution description
This reverts commit 422644b.
The option is only supported after 2.6 which is currently not the
version given with 'esp' toolchain.
It was a bit too early to switch to the new version.
Version 2.7 also supports the old option with only a warning.
The version installed in the 'esp8266' toolchain is version 2.5 that do not support the option. So use the old name as it is still compatible.
This could be re-added when the installed
esptool.pyis at least 2.6 everywhere.Fixes #12247
Testing procedure
Please test the procedure from #12247
I used this adapted test procedure for my machine:
It works again with this PR:
With master:
Issues/PRs references
Reported in: