Load ELF data directly using probe_rs#690
Open
mkeeter wants to merge 1 commit into
Open
Conversation
Contributor
Author
|
I flashed both the SP and RoT on Grapefruit, and everything looks fine. |
mkeeter
commented
Jun 3, 2026
| humility-cli = { workspace = true } | ||
| clap = { workspace = true } | ||
| anyhow = { workspace = true } | ||
| parse_int = { workspace = true } |
Contributor
Author
There was a problem hiding this comment.
These were unused dependencies that I happened to notice while pruning.
There was a problem hiding this comment.
Pull request overview
This PR updates the flashing workflow to load ELF data directly via probe-rs instead of converting ELF to IHEX/SREC first, reducing dependencies and simplifying the flash pipeline. It also introduces a dedicated LoadError type for ProbeCore::load.
Changes:
- Switch
ProbeCore::loadto accept in-memory ELF bytes and program flash viaprobe-rs’s ELF loader/flash loader APIs. - Remove IHEX/SREC/tempfile-related conversion code and associated dependencies from the
flashandrebootlebycommands. - Prune workspace dependencies (
ihex,srec,tempfile,path-slash, etc.) and update lockfile accordingly.
Reviewed changes
Copilot reviewed 5 out of 6 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| humility-probes-core/src/probe_rs.rs | Introduces LoadError and changes ProbeCore::load to program ELF bytes directly via probe-rs. |
| cmd/flash/src/lib.rs | Updates flash command to pass ELF bytes directly to core.load. |
| cmd/flash/Cargo.toml | Removes now-unneeded dependencies related to ELF→IHEX/SREC conversion. |
| cmd/rebootleby/Cargo.toml | Removes dependencies no longer used by the command. |
| Cargo.toml | Removes workspace-level dependencies that are no longer required. |
| Cargo.lock | Reflects dependency graph changes after removing IHEX/SREC/tempfile/etc. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+246
to
+248
| /// Loading is not allowed when `can_flash = false` | ||
| #[error("ProbeCore was constructed with can_flash = false")] | ||
| NotAllowed, |
Comment on lines
287
to
+292
| let erase_style = ProgressStyle::default_bar() | ||
| .template("humility: erasing [{bar:30}] {bytes}/{total_bytes}")?; | ||
| .template("humility: erasing [{bar:30}] {bytes}/{total_bytes}") | ||
| .unwrap(); | ||
| let flash_style = ProgressStyle::default_bar() | ||
| .template("humility: flashing [{bar:30}] {bytes}/{total_bytes}")?; | ||
| .template("humility: flashing [{bar:30}] {bytes}/{total_bytes}") | ||
| .unwrap(); |
Contributor
Author
There was a problem hiding this comment.
This is deliberate; the progress bar can only fail if it's given an invalid template string, and we won't do that (or will catch it quickly, because it's a loud failure mode).
mkeeter
force-pushed
the
mkeeter/only-load-with-a-probe
branch
from
b2d785b to
dd14be6
Compare
mkeeter
force-pushed
the
mkeeter/probe-that-elf
branch
from
024eac3 to
869db6f
Compare
mkeeter
force-pushed
the
mkeeter/probe-that-elf
branch
from
869db6f to
fe3045b
Compare
mkeeter
force-pushed
the
mkeeter/only-load-with-a-probe
branch
from
dd14be6 to
e4e0918
Compare
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.
(staged on #689)
Now that we are using
probe-rsfor everything, we don't need to convert to IHEX / SREC. This lets us remove a bunch of dependencies. I also switchedProbeCore::loadto return a strong error type, while I was poking at it.This is a building block for a
humility flashlibrary.Bidding a fond farewell to the best docstring in the codebase, describing
elf_chunks: