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.

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

Write the image to the correct target app partition #634

Merged
merged 1 commit into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed help text for size parameter of read-flash subcommand
- Fixed port detection on `musl` when detection returns paths starting with `/dev/`
- [cargo-espflash]: Always resolve package_id from metadata when finding bootloader and partition table (#632)
- Fixed behavior of the --target-app-partition flag (#634)

### Changed

Expand Down
18 changes: 2 additions & 16 deletions espflash/src/image_format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ impl<'a> IdfBootloaderFormat<'a> {
let app_size = data.len() as u32;
let part_size = target_app_partition.size();

// The size of the application must not exceed the size of the factory
// The size of the application must not exceed the size of the target app
// partition.
if app_size as f32 / part_size as f32 > 1.0 {
return Err(Error::ElfTooBig(app_size, part_size));
Expand Down Expand Up @@ -307,22 +307,8 @@ impl<'a> IdfBootloaderFormat<'a> {
data: Cow::Owned(self.partition_table.to_bin().unwrap()),
};

let app_partition = self
.partition_table
.find("factory")
.or_else(|| self.partition_table.find_by_type(Type::App))
.expect("no application partition found");

if self.flash_segment.data.len() > app_partition.size() as usize {
panic!(
"image size ({} bytes) is larger partition size ({} bytes)",
self.flash_segment.data.len(),
app_partition.size()
);
}

let app_segment = RomSegment {
addr: app_partition.offset(),
addr: self.flash_segment.addr,
data: Cow::Borrowed(&self.flash_segment.data),
};

Expand Down
Loading