Skip to content
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

Jump to bottom

Fix direct-boot image check for ESP32-S3 #207

Merged
merged 2 commits into from
Jul 19, 2022
Merged

Fix direct-boot image check for ESP32-S3 #207

merged 2 commits into from
Jul 19, 2022

Conversation

bjoernQ
Copy link
Contributor

@bjoernQ bjoernQ commented Jul 19, 2022 •
edited
Loading

Unlike the ESP32-C3 the magic bytes to identify a direct-boot image is at offset 0x400 for ESP32-S3.

@bjoernQ bjoernQ requested a review from jessebraham July 19, 2022 07:27
@bjoernQ bjoernQ marked this pull request as draft July 19, 2022 07:29
MabezDev
MabezDev approved these changes Jul 19, 2022
View reviewed changes
Copy link
Member

@MabezDev MabezDev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Just a small nitpick that you can leave if you like :)

espflash/src/image_format/esp32directboot.rs Outdated Show resolved Hide resolved
jessebraham
jessebraham requested changes Jul 19, 2022
View reviewed changes
Copy link
Member

@jessebraham jessebraham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good overall, thanks for the fix! I agree with @MabezDev, let's change magic_position to offset and then I think it's good to go.

@jessebraham jessebraham marked this pull request as ready for review July 19, 2022 14:30
jessebraham
jessebraham approved these changes Jul 19, 2022
View reviewed changes
Copy link
Member

@jessebraham jessebraham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for updating that!

@jessebraham jessebraham merged commit 12f5a41 into esp-rs:master Jul 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MabezDev MabezDev MabezDev approved these changes

@jessebraham jessebraham jessebraham approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bjoernQ @jessebraham @MabezDev