Check if bootloader has app descriptor #872
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
bjoernQ
reviewed
May 30, 2025
espflash/src/bin/espflash.rs
Outdated
| let section = object.section_by_name(".rodata_desc").is_some(); | ||
| let symbol = object.symbols().any(|sym| sym.name() == Ok("esp_app_desc")); | ||
|
|
||
| if !section || !symbol { |
Contributor
There was a problem hiding this comment.
we probably could check more things like the size of the app-desc, the magic word at the start and the placement (i.e. address) but if the check fails on these we screwed up and we have hil-tests for that
Contributor
Author
|
I'm not sure if we need to check this on other places as well or |
MabezDev
requested changes
Jun 2, 2025
jessebraham
reviewed
Jun 2, 2025
MabezDev
requested changes
Jun 11, 2025
Member
MabezDev
left a comment
MabezDev
left a comment
There was a problem hiding this comment.
This is nearly there! I think we should move the check code out lib.rs though, I suggested a new place.
MabezDev
reviewed
Jun 11, 2025
MabezDev
approved these changes
Jun 11, 2025
Member
MabezDev
left a comment
MabezDev
left a comment
There was a problem hiding this comment.
LGTM with suggestion applied, thanks!
Co-authored-by: Scott Mabin <[email protected]>
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
MabezDev
added a commit
that referenced
this pull request
Jun 12, 2025
* Check if bootloader has app descriptor * changelog * refactor * another refactor * Update espflash/src/image_format/esp_idf.rs Co-authored-by: Scott Mabin <[email protected]> --------- Co-authored-by: Scott Mabin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This checks, if the bootloader has an app desc present, if not, returns an error.
Also added an option for users to disable the check.
closes #866