Check if bootloader has app descriptor #872
Open
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
| 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 { |
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
|
I'm not sure if we need to check this on other places as well or |
MabezDev
requested changes
Jun 2, 2025
| @@ -235,6 +236,16 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> { | |||
| // Read the ELF data from the build path and load it to the target. | |||
| let elf_data = fs::read(&args.image).into_diagnostic()?; | |||
|
|
|||
| if args.flash_args.image.check_app_descriptor.unwrap_or(true) { | |||
There was a problem hiding this comment.
We also need this check in cargo-espflash. I suggest taking the guts of this block and extracting into a function in the library, which both binaries can call to do the check.
There was a problem hiding this comment.
This check should also only be performed when using the esp-idf image format, which is why I had suggested holding off on this until those changes had been made.
jessebraham
reviewed
Jun 2, 2025
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.
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